From 2b3d56e153b229119fddfa7b378f4d671ee0092c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 20 Feb 2006 20:40:51 +0000
Subject: [PATCH] r13577: Move some (possibly system-defined) defines to
 replace.h

---
 source/lib/replace/replace.h | 16 ++++++++++++++++
 source/lib/time.c            | 18 ++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/source/lib/replace/replace.h b/source/lib/replace/replace.h
index 0f1eb42ac0d..24876ffd4eb 100644
--- a/source/lib/replace/replace.h
+++ b/source/lib/replace/replace.h
@@ -162,6 +162,14 @@ int rep_mkstemp(char *temp);
 #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 @@ int rep_mkstemp(char *temp);
 #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
diff --git a/source/lib/time.c b/source/lib/time.c
index 07c0a48c8ca..7721a2c456c 100644
--- a/source/lib/time.c
+++ b/source/lib/time.c
@@ -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