diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-10-10 11:57:16 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:42:46 +0100 |
| commit | 6876d2613da8e579146040babd33e71fc1889d46 (patch) | |
| tree | 81e4d31f43d9f1773a9c74b9c172d66a9388166e /source4 | |
| parent | fa7608481a33c9e3907306a5d44bcea94d255f3b (diff) | |
| download | samba-6876d2613da8e579146040babd33e71fc1889d46.tar.gz samba-6876d2613da8e579146040babd33e71fc1889d46.tar.bz2 samba-6876d2613da8e579146040babd33e71fc1889d46.zip | |
r25601: replace.h should never imply any "system/*.h"
(here it's "system/time.h")
metze
(This used to be commit 00467c25930a527eb9831cfd893bd8e217ca4f74)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/replace/replace.h | 9 | ||||
| -rw-r--r-- | source4/lib/replace/system/time.h | 10 |
2 files changed, 12 insertions, 7 deletions
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h index 26e39ac603..fcf75635a7 100644 --- a/source4/lib/replace/replace.h +++ b/source4/lib/replace/replace.h @@ -91,19 +91,14 @@ char *rep_strdup(const char *s); void *rep_memmove(void *dest,const void *src,int size); #endif -#if !defined(HAVE_MKTIME) || !defined(HAVE_TIMEGM) -#include "system/time.h" -#endif - #ifndef HAVE_MKTIME #define mktime rep_mktime -time_t rep_mktime(struct tm *t); +/* prototype is in "system/time.h" */ #endif #ifndef HAVE_TIMEGM -struct tm; #define timegm rep_timegm -time_t rep_timegm(struct tm *tm); +/* prototype is in "system/time.h" */ #endif #ifndef HAVE_STRLCPY diff --git a/source4/lib/replace/system/time.h b/source4/lib/replace/system/time.h index 6bbb6b15bb..036812ab8f 100644 --- a/source4/lib/replace/system/time.h +++ b/source4/lib/replace/system/time.h @@ -41,4 +41,14 @@ #include <utime.h> #endif +#ifndef HAVE_MKTIME +/* define is in "replace.h" */ +time_t rep_mktime(struct tm *t); +#endif + +#ifndef HAVE_TIMEGM +/* define is in "replace.h" */ +time_t rep_timegm(struct tm *tm); +#endif + #endif |