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

[metze at samba.org]

Author: metze
Date: 2006-01-07 10:28:48 +0000 (Sat, 07 Jan 2006)
New Revision: 12754

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

Log:
- sync TIME_T_MAX calculation from samba3
- but limit TIME_T_MAX to INT32_MAX, otherwise 64 platfroms are broken
  because gmtime() will fail with INT64_MAX passed in!

I'm not sure if that's the best fix for this problem, but it works...

Should we port the INT32_MAX limitation to samba3?

Comments, please?

metze
Modified:
   branches/SAMBA_4_0/source/lib/time.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/time.c
===================================================================
--- branches/SAMBA_4_0/source/lib/time.c	2006-01-07 00:06:58 UTC (rev 12753)
+++ branches/SAMBA_4_0/source/lib/time.c	2006-01-07 10:28:48 UTC (rev 12754)
@@ -24,25 +24,17 @@
 #include "system/time.h"
 
 #ifndef CHAR_BIT
-# define CHAR_BIT 8
+#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
-#define TIME_T_MIN 0
+#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 _TYPE_MAXIMUM (time_t)
+#define TIME_T_MAX MIN(INT32_MAX,(~ (time_t) 0 - TIME_T_MIN))
 #endif
 			      
-			      
 /*******************************************************************
  External access to time_t_min and time_t_max.
 ********************************************************************/