summaryrefslogtreecommitdiff
path: root/lib/replace
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2015-09-27 00:57:50 +0200
committerMichael Adam <obnox@samba.org>2015-10-01 02:55:21 +0200
commitd9000cbc944fa58cc7b7bc509ce885d7b5f498af (patch)
tree2c4f2a0fd81354d433144cec065dc8b3b7a9bfef /lib/replace
parent22c5699751d8a7b3eda33260c7ec9f0a8771d25b (diff)
downloadsamba-d9000cbc944fa58cc7b7bc509ce885d7b5f498af.tar.gz
libreplace: Fix the build on Solaris
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'lib/replace')
-rw-r--r--lib/replace/replace.c2
-rw-r--r--lib/replace/wscript5
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/replace/replace.c b/lib/replace/replace.c
index 798990a9abc..c9c12a4ac9a 100644
--- a/lib/replace/replace.c
+++ b/lib/replace/replace.c
@@ -829,7 +829,7 @@ int rep_clock_gettime(clockid_t clk_id, struct timespec *tp)
struct timeval tval;
switch (clk_id) {
case 0: /* CLOCK_REALTIME :*/
-#ifdef HAVE_GETTIMEOFDAY_TZ
+#if defined(HAVE_GETTIMEOFDAY_TZ) || defined(HAVE_GETTIMEOFDAY_TZ_VOID)
gettimeofday(&tval,NULL);
#else
gettimeofday(&tval);
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 9a8b7f70503..0be52f7a431 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -506,6 +506,11 @@ removeea setea
'int gettimeofday(struct timeval *tv, struct timezone *tz)',
define='HAVE_GETTIMEOFDAY_TZ', headers='sys/time.h')
+ conf.CHECK_C_PROTOTYPE('gettimeofday',
+ 'int gettimeofday(struct timeval *tv, void *tz)',
+ define='HAVE_GETTIMEOFDAY_TZ_VOID',
+ headers='sys/time.h')
+
conf.CHECK_CODE('#include "test/snprintf.c"',
define="HAVE_C99_VSNPRINTF",
execute=True,