[SCM] Samba Shared Repository - branch v3-4-test updated
Karolin Seeger
kseeger at samba.org
Mon Apr 12 08:03:02 MDT 2010
The branch, v3-4-test has been updated
via be86206... s3:lib/time: remove TIME_T_MIN/MAX defines
via 32b0c2c... lib/util: move TIME_T_MIN/MAX defines into header file (cherry picked from commit 571ee54b791b93ad46e09ed563ef4a5582dcf0c8)
from 6af316b... WHATSNEW: Start release notes for Samba 3.4.8.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit be86206167acb55bee2722c48a5ea09535cf2b99
Author: Björn Jacke <bj at sernet.de>
Date: Thu Jan 7 00:41:50 2010 +0100
s3:lib/time: remove TIME_T_MIN/MAX defines
we already get them from lib/util/time.h
(cherry picked from commit f5729dbb6e720cb6076ea053f1ad0680259e6b39)
The last two patches address bug #7352 (TIME_T_MAX defines inconsistent).
commit 32b0c2c2c1d0e8f69de264f2c3c3b1d473f9ec4f
Author: Björn Jacke <bj at sernet.de>
Date: Thu Jan 7 00:40:09 2010 +0100
lib/util: move TIME_T_MIN/MAX defines into header file (cherry picked from commit 571ee54b791b93ad46e09ed563ef4a5582dcf0c8)
-----------------------------------------------------------------------
Summary of changes:
lib/util/time.c | 14 --------------
lib/util/time.h | 14 ++++++++++++++
source3/lib/time.c | 8 --------
3 files changed, 14 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/time.c b/lib/util/time.c
index eadafe4..571219b 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -27,11 +27,6 @@
* @brief time handling functions
*/
-#ifndef TIME_T_MIN
-/* we use 0 here, because (time_t)-1 means error */
-#define TIME_T_MIN 0
-#endif
-
#if (SIZEOF_LONG == 8)
#define TIME_FIXUP_CONSTANT_INT 11644473600L
#elif (SIZEOF_LONG_LONG == 8)
@@ -40,15 +35,6 @@
-/*
- * we use the INT32_MAX here as on 64 bit systems,
- * gmtime() fails with INT64_MAX
- */
-
-#ifndef TIME_T_MAX
-#define TIME_T_MAX MIN(INT32_MAX,_TYPE_MAXIMUM(time_t))
-#endif
-
/**
External access to time_t_min and time_t_max.
**/
diff --git a/lib/util/time.h b/lib/util/time.h
index e40de2d..cf6dc1c 100644
--- a/lib/util/time.h
+++ b/lib/util/time.h
@@ -23,6 +23,20 @@
#define _PUBLIC_
#endif
+#ifndef TIME_T_MIN
+/* we use 0 here, because (time_t)-1 means error */
+#define TIME_T_MIN 0
+#endif
+
+/*
+ * we use the INT32_MAX here as on 64 bit systems,
+ * gmtime() fails with INT64_MAX
+ */
+#ifndef TIME_T_MAX
+#define TIME_T_MAX MIN(INT32_MAX,_TYPE_MAXIMUM(time_t))
+#endif
+
+
/* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30, 4 byte aligned */
typedef uint64_t NTTIME;
diff --git a/source3/lib/time.c b/source3/lib/time.c
index 839ebe9..0eee008 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -28,14 +28,6 @@
*/
-#ifndef TIME_T_MIN
-#define TIME_T_MIN ((time_t)0 < (time_t) -1 ? (time_t) 0 \
- : ~ (time_t) 0 << (sizeof (time_t) * CHAR_BIT - 1))
-#endif
-#ifndef TIME_T_MAX
-#define TIME_T_MAX (~ (time_t) 0 - TIME_T_MIN)
-#endif
-
#define NTTIME_INFINITY (NTTIME)0x8000000000000000LL
#if (SIZEOF_LONG == 8)
--
Samba Shared Repository
More information about the samba-cvs
mailing list