svn commit: samba r13577 - in branches/SAMBA_4_0/source/lib: . replace

[jelmer at samba.org]

Author: jelmer
Date: 2006-02-20 20:40:51 +0000 (Mon, 20 Feb 2006)
New Revision: 13577

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13577

Log:
Move some (possibly system-defined) defines to replace.h

Modified:
   branches/SAMBA_4_0/source/lib/replace/replace.h
   branches/SAMBA_4_0/source/lib/time.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/replace.h	2006-02-20 20:09:36 UTC (rev 13576)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h	2006-02-20 20:40:51 UTC (rev 13577)
@@ -162,6 +162,14 @@
 #include <limits.h>
 #endif
 
+/* The extra casts work around common compiler bugs.  */
+#define _TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
+   It is necessary at least when t == time_t.  */
+#define _TYPE_MINIMUM(t) ((t) (_TYPE_SIGNED (t) \
+  			      ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
+#define _TYPE_MAXIMUM(t) ((t) (~ (t) 0 - _TYPE_MINIMUM (t)))
+
 #ifndef HOST_NAME_MAX
 #define HOST_NAME_MAX 64
 #endif
@@ -178,4 +186,12 @@
 #define UINT64_MAX ((uint64_t)-1)
 #endif
 
+#ifndef CHAR_BIT
+#define CHAR_BIT 8
 #endif
+
+#ifndef INT32_MAX
+#define INT32_MAX _TYPE_MAXIMUM(int32_t)
+#endif
+
+#endif

Modified: branches/SAMBA_4_0/source/lib/time.c
===================================================================
--- branches/SAMBA_4_0/source/lib/time.c	2006-02-20 20:09:36 UTC (rev 13576)
+++ branches/SAMBA_4_0/source/lib/time.c	2006-02-20 20:40:51 UTC (rev 13577)
@@ -23,31 +23,17 @@
 #include "includes.h"
 #include "system/time.h"
 
-#ifndef CHAR_BIT
-#define CHAR_BIT 8
-#endif
-
-/* The extra casts work around common compiler bugs.  */
-#define _TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
-/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
-   It is necessary at least when t == time_t.  */
-#define _TYPE_MINIMUM(t) ((t) (_TYPE_SIGNED (t) \
-  			      ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
-#define _TYPE_MAXIMUM(t) ((t) (~ (t) 0 - _TYPE_MINIMUM (t)))
-			      
 #ifndef TIME_T_MIN
 /* we use 0 here, because (time_t)-1 means error */
 #define TIME_T_MIN 0
 #endif
-#ifndef TIME_T_MAX
+
 /*
  * we use the INT32_MAX here as on 64 bit systems,
  * gmtime() fails with INT64_MAX
  */
-#ifndef INT32_MAX
-#define INT32_MAX _TYPE_MAXIMUM(int32_t)
-#endif
 
+#ifndef TIME_T_MAX
 #define TIME_T_MAX MIN(INT32_MAX,_TYPE_MAXIMUM(time_t))
 #endif