[SCM] Samba Shared Repository branch, v3-2-test, updated. initial-v3-2-unstable-11-g3f1ac56

Jeremy Allison jra at samba.org
Thu Oct 11 00:57:33 GMT 2007

The branch, v3-2-test has been updated
       via  3f1ac564c0ab6d498a47da84b4b5744d8d376f3b (commit)
       via  d39ce8e37ed81f4a34a148f975874989d8d187a1 (commit)
      from  52ca48f1881fc7b6ac9d1252468bb20eee174407 (commit)


Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3f1ac564c0ab6d498a47da84b4b5744d8d376f3b
Merge: d39ce8e37ed81f4a34a148f975874989d8d187a1 52ca48f1881fc7b6ac9d1252468bb20eee174407
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Oct 10 17:56:55 2007 -0700

    Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into SAMBA_3_2_0

commit d39ce8e37ed81f4a34a148f975874989d8d187a1
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Oct 10 17:56:19 2007 -0700

    Merge from metze of libreplace header changes


Summary of changes:
 source/lib/replace/replace.h     |    8 ++------
 source/lib/replace/system/time.h |   10 ++++++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

Changeset truncated at 500 lines:

diff --git a/source/lib/replace/replace.h b/source/lib/replace/replace.h
index 26e39ac..3dc10db 100644
--- a/source/lib/replace/replace.h
+++ b/source/lib/replace/replace.h
@@ -91,19 +91,15 @@ char *rep_strdup(const char *s);
 void *rep_memmove(void *dest,const void *src,int size);
-#if !defined(HAVE_MKTIME) || !defined(HAVE_TIMEGM)
-#include "system/time.h"
 #ifndef HAVE_MKTIME
 #define mktime rep_mktime
-time_t rep_mktime(struct tm *t);
+/* prototype is in "system/time.h" */
 #ifndef HAVE_TIMEGM
 struct tm;
 #define timegm rep_timegm
-time_t rep_timegm(struct tm *tm);
+/* prototype is in "system/time.h" */
diff --git a/source/lib/replace/system/time.h b/source/lib/replace/system/time.h
index 6bbb6b1..036812a 100644
--- a/source/lib/replace/system/time.h
+++ b/source/lib/replace/system/time.h
@@ -41,4 +41,14 @@
 #include <utime.h>
+#ifndef HAVE_MKTIME
+/* define is in "replace.h" */
+time_t rep_mktime(struct tm *t);
+#ifndef HAVE_TIMEGM
+/* define is in "replace.h" */
+time_t rep_timegm(struct tm *tm);

Samba Shared Repository

More information about the samba-cvs mailing list