Author: metze Date: 2007-10-10 11:57:16 +0000 (Wed, 10 Oct 2007) New Revision: 25601
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25601 Log: replace.h should never imply any "system/*.h" (here it's "system/time.h") metze Modified: branches/SAMBA_4_0/source/lib/replace/replace.h branches/SAMBA_4_0/source/lib/replace/system/time.h Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/replace.h =================================================================== --- branches/SAMBA_4_0/source/lib/replace/replace.h 2007-10-10 10:19:19 UTC (rev 25600) +++ branches/SAMBA_4_0/source/lib/replace/replace.h 2007-10-10 11:57:16 UTC (rev 25601) @@ -91,19 +91,14 @@ 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 Modified: branches/SAMBA_4_0/source/lib/replace/system/time.h =================================================================== --- branches/SAMBA_4_0/source/lib/replace/system/time.h 2007-10-10 10:19:19 UTC (rev 25600) +++ branches/SAMBA_4_0/source/lib/replace/system/time.h 2007-10-10 11:57:16 UTC (rev 25601) @@ -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
