summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-05 02:03:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:09 -0500
commita587277aa31dcb9dc46e02e165e2c4ebb6e2be1a (patch)
treeba740d8c99f1e10e53a17a2325255db0d547bec4
parentd9319068f5745af01619d46468eca9cc9b57b5be (diff)
downloadsamba-a587277aa31dcb9dc46e02e165e2c4ebb6e2be1a.tar.gz
samba-a587277aa31dcb9dc46e02e165e2c4ebb6e2be1a.tar.bz2
samba-a587277aa31dcb9dc46e02e165e2c4ebb6e2be1a.zip
r18055: aix needs time.h for timegm.c to compile
(This used to be commit 1c91de687f0078100aa9de9111416c9fced45990)
-rw-r--r--source4/lib/replace/config.m41
-rw-r--r--source4/lib/replace/timegm.c8
2 files changed, 9 insertions, 0 deletions
diff --git a/source4/lib/replace/config.m4 b/source4/lib/replace/config.m4
index 32870df386..0a8e4448b0 100644
--- a/source4/lib/replace/config.m4
+++ b/source4/lib/replace/config.m4
@@ -50,6 +50,7 @@ AC_TRY_COMPILE([
[AC_DEFINE(socklen_t, int,[Socket length type])])
AC_CHECK_HEADERS(sys/syslog.h syslog.h)
+AC_CHECK_HEADERS(sys/time.h time.h)
AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
AC_CHECK_FUNCS(waitpid strlcpy strlcat innetgr initgroups memmove strdup)
diff --git a/source4/lib/replace/timegm.c b/source4/lib/replace/timegm.c
index 1c9a0e4165..c2746db1a4 100644
--- a/source4/lib/replace/timegm.c
+++ b/source4/lib/replace/timegm.c
@@ -40,6 +40,14 @@
#ifndef HAVE_TIMEGM
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#ifdef TIME_H
+#include <time.h>
+#endif
+
static int is_leap(unsigned y)
{
y += 1900;