diff options
| author | Guenther Deschner <gd@samba.org> | 2007-10-11 15:18:50 +0200 |
|---|---|---|
| committer | Guenther Deschner <gd@samba.org> | 2007-10-11 15:18:50 +0200 |
| commit | 89d33395e31a7ccb6b091e4a99a30d12e3367238 (patch) | |
| tree | f2ec7c4ddbf9134ecae18e27bf792b90da372663 /source3/lib/replace | |
| parent | 6b441e9e74b11bee4b661eaa17682d6351c264ff (diff) | |
| parent | edfcfefa37bf948c990e7ad3a1aea1dd4c3cea09 (diff) | |
| download | samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.tar.gz samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.tar.bz2 samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.zip | |
Merge commit 'origin/v3-2-test' into my_branch
(This used to be commit fbe5edec375c99421d19af086c4f597e70c963b8)
Diffstat (limited to 'source3/lib/replace')
| -rw-r--r-- | source3/lib/replace/replace.h | 8 | ||||
| -rw-r--r-- | source3/lib/replace/system/time.h | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 26e39ac603..3dc10db59f 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -91,19 +91,15 @@ 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/source3/lib/replace/system/time.h b/source3/lib/replace/system/time.h index 6bbb6b15bb..036812ab8f 100644 --- a/source3/lib/replace/system/time.h +++ b/source3/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 |