summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-11 04:10:32 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:20:05 -0500
commit5f26a5a18af948a671ee9b043e1f51dc72d91749 (patch)
treee44158499061016ada51bc6b99269f283a693dbe /source4
parent2fa99e56bc6b1fd52ecc122740ece8771e4069c8 (diff)
downloadsamba-5f26a5a18af948a671ee9b043e1f51dc72d91749.tar.gz
samba-5f26a5a18af948a671ee9b043e1f51dc72d91749.tar.bz2
samba-5f26a5a18af948a671ee9b043e1f51dc72d91749.zip
r8312: fixed some heimdal header checks from watching the build farm failures
when we added heimdal we dropped from 10 passing builds to 1, but hopefully that will go up with a bit of effort (This used to be commit 753d7ab715701a162689ffe9cdff7c56fcf7f2a2)
Diffstat (limited to 'source4')
-rw-r--r--source4/heimdal_build/config.m44
-rw-r--r--source4/heimdal_build/krb5-types.h6
2 files changed, 8 insertions, 2 deletions
diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
index 365f4061e5..b41fde236b 100644
--- a/source4/heimdal_build/config.m4
+++ b/source4/heimdal_build/config.m4
@@ -1,5 +1,5 @@
-AC_CHECK_HEADERS(sys/file.h signal.h errno.h crypt.h curses.h sys/bittypes.h)
-AC_CHECK_HEADERS(sys/stropts.h sys/timeb.h sys/times.h sys/uio.h sys/un.h)
+AC_CHECK_HEADERS(sys/file.h signal.h errno.h crypt.h curses.h sys/bitypes.h)
+AC_CHECK_HEADERS(sys/stropts.h sys/timeb.h sys/times.h sys/uio.h sys/un.h inttypes.h)
AC_CHECK_HEADERS(sys/utsname.h termcap.h term.h timezone.h time.h ttyname.h netdb.h)
AC_CHECK_FUNCS(setitimer uname umask unsetenv socket sendmsg putenv atexit strsep)
diff --git a/source4/heimdal_build/krb5-types.h b/source4/heimdal_build/krb5-types.h
index 68a8bc0da4..fc366545fc 100644
--- a/source4/heimdal_build/krb5-types.h
+++ b/source4/heimdal_build/krb5-types.h
@@ -4,9 +4,15 @@
#ifndef __krb5_types_h__
#define __krb5_types_h__
+#if HAVE_INTTYPES_H
#include <inttypes.h>
+#endif
+#if HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
+#if HAVE_SYS_BITYPES_H
#include <sys/bitypes.h>
+#endif
#include <sys/socket.h>