diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-05-09 10:47:23 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-09 10:47:23 +1000 |
commit | 00ebe3df811a9eb7737fa6278d8784500c35bd14 (patch) | |
tree | b9b0291e764d49586bab6388353a59515353a66e /source4/lib/replace/system | |
parent | f446bf59e300a53f4564bcf99d8614b440905147 (diff) | |
parent | ca6ac11b46a75bf02cf873c6aedb4f85af227168 (diff) | |
download | samba-00ebe3df811a9eb7737fa6278d8784500c35bd14.tar.gz samba-00ebe3df811a9eb7737fa6278d8784500c35bd14.tar.bz2 samba-00ebe3df811a9eb7737fa6278d8784500c35bd14.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 2db0e86fb4abc27eed2d35e1d41122bc89a2c5fe)
Diffstat (limited to 'source4/lib/replace/system')
-rw-r--r-- | source4/lib/replace/system/config.m4 | 2 | ||||
-rw-r--r-- | source4/lib/replace/system/time.h | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/source4/lib/replace/system/config.m4 b/source4/lib/replace/system/config.m4 index ae26bb5590..5c9b53d5c5 100644 --- a/source4/lib/replace/system/config.m4 +++ b/source4/lib/replace/system/config.m4 @@ -9,7 +9,7 @@ AC_CHECK_HEADERS(sys/select.h) # time AC_CHECK_HEADERS(sys/time.h utime.h) AC_HEADER_TIME -AC_CHECK_FUNCS(utime utimes futimes) +AC_CHECK_FUNCS(utime utimes) # wait AC_HEADER_SYS_WAIT diff --git a/source4/lib/replace/system/time.h b/source4/lib/replace/system/time.h index 036812ab8f..4abf295d1a 100644 --- a/source4/lib/replace/system/time.h +++ b/source4/lib/replace/system/time.h @@ -39,6 +39,11 @@ #ifdef HAVE_UTIME_H #include <utime.h> +#else +struct utimbuf { + time_t actime; /* access time */ + time_t modtime; /* modification time */ +}; #endif #ifndef HAVE_MKTIME @@ -51,4 +56,14 @@ time_t rep_mktime(struct tm *t); time_t rep_timegm(struct tm *tm); #endif +#ifndef HAVE_UTIME +/* define is in "replace.h" */ +int rep_utime(const char *filename, const struct utimbuf *buf); +#endif + +#ifndef HAVE_UTIMES +/* define is in "replace.h" */ +int rep_utimes(const char *filename, const struct timeval tv[2]); +#endif + #endif |