pajoye Mon Jun 15 14:47:16 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date/lib timelib_structs.h
Log:
- MFH: simplify, use correct type and silent warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timelib_structs.h?r1=1.13.2.6.2.3.2.9&r2=1.13.2.6.2.3.2.10&diff_format=u
Index: php-src/ext/date/lib/timelib_structs.h
diff -u php-src/ext/date/lib/timelib_structs.h:1.13.2.6.2.3.2.9
php-src/ext/date/lib/timelib_structs.h:1.13.2.6.2.3.2.10
--- php-src/ext/date/lib/timelib_structs.h:1.13.2.6.2.3.2.9 Sun May 3
18:22:40 2009
+++ php-src/ext/date/lib/timelib_structs.h Mon Jun 15 14:47:15 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: timelib_structs.h,v 1.13.2.6.2.3.2.9 2009/05/03 18:22:40 derick Exp $
*/
+/* $Id: timelib_structs.h,v 1.13.2.6.2.3.2.10 2009/06/15 14:47:15 pajoye Exp $
*/
#ifndef __TIMELIB_STRUCTS_H__
#define __TIMELIB_STRUCTS_H__
@@ -33,19 +33,23 @@
#include <stdint.h>
#endif
-#ifndef HAVE_INT32_T
-# if SIZEOF_INT == 4
+#ifdef PHP_WIN32
+# include "win32/php_stdint.h"
+#else
+# ifndef HAVE_INT32_T
+# if SIZEOF_INT == 4
typedef int int32_t;
-# elif SIZEOF_LONG == 4
+# elif SIZEOF_LONG == 4
typedef long int int32_t;
+# endif
# endif
-#endif
-#ifndef HAVE_UINT32_T
-# if SIZEOF_INT == 4
+# ifndef HAVE_UINT32_T
+# if SIZEOF_INT == 4
typedef unsigned int uint32_t;
-# elif SIZEOF_LONG == 4
+# elif SIZEOF_LONG == 4
typedef unsigned long int uint32_t;
+# endif
# endif
#endif
@@ -62,25 +66,15 @@
#endif
#if defined(_MSC_VER)
-typedef unsigned __int64 timelib_ull;
-typedef __int64 timelib_sll;
+typedef uint64_t timelib_ull;
+typedef int64_t timelib_sll;
+# define TIMELIB_LL_CONST(n) n ## i64
#else
typedef unsigned long long timelib_ull;
typedef signed long long timelib_sll;
+# define TIMELIB_LL_CONST(n) n ## ll
#endif
-#if defined(_MSC_VER)
-#define int32_t __int32
-#define uint32_t unsigned __int32
-#endif
-
-#if defined(_MSC_VER)
-#define TIMELIB_LL_CONST(n) n ## i64
-#else
-#define TIMELIB_LL_CONST(n) n ## ll
-#endif
-
-
typedef struct ttinfo
{
int32_t offset;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
