Nuke PHP_ prefix from timelib

diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index a5d5b591e6f997ff7d384b778eefe27d85faefae..dd383e6c9a39b9400eda538312c33fc1b7495d41 100644 (file)
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -23,7 +23,7 @@
 #include <string.h>
 #include "datetime.h"
 
-#ifdef PHP_WIN32
+#if defined(_MSC_VER)
 #define strcasecmp stricmp
 #define strtoll(s, f, b) _atoi64(s)
 #endif

diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
index f5eac2aeac6f3955877c596dc8fb805c3b662f3e..6e98a1b9d50e3fd1fd3b8a31f0e0a2edf3b05e0d 100644 (file)
--- a/ext/date/lib/parse_tz.c
+++ b/ext/date/lib/parse_tz.c
@@ -19,7 +19,7 @@
 /* $Id$ */
 
 #include <stdio.h>
-#ifdef PHP_WIN32
+#ifdef WIN32
 #include <winsock2.h>
 #else
 #include <netinet/in.h>

diff --git a/ext/date/lib/resource/parse_date.re b/ext/date/lib/resource/parse_date.re
index a5d5b591e6f997ff7d384b778eefe27d85faefae..dd383e6c9a39b9400eda538312c33fc1b7495d41 100644 (file)
--- a/ext/date/lib/resource/parse_date.re
+++ b/ext/date/lib/resource/parse_date.re
@@ -23,7 +23,7 @@
 #include <string.h>
 #include "datetime.h"
 
-#ifdef PHP_WIN32
+#if defined(_MSC_VER)
 #define strcasecmp stricmp
 #define strtoll(s, f, b) _atoi64(s)
 #endif

diff --git a/ext/date/lib/timelib_structs.h b/ext/date/lib/timelib_structs.h
index f3bf3250914f7ebd66d6573f18c16883e4f61992..52dc21bf2145e2464c617ec427a4122dd1885403 100644 (file)
--- a/ext/date/lib/timelib_structs.h
+++ b/ext/date/lib/timelib_structs.h
@@ -24,13 +24,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef PHP_WIN32
+#ifdef WIN32
 #include <winsock2.h>
 #else
 #include <netinet/in.h>
 #endif
 
-#if defined(PHP_WIN32) && _MSC_VER < 1300
+#if defined(_MSC_VER) && _MSC_VER < 1300
 typedef unsigned __int64 timelib_ull;
 typedef __int64 timelib_sll;
 #else

diff --git a/ext/date/lib/unixtime2tm.c b/ext/date/lib/unixtime2tm.c
index a198b405a98340d80032f06df1893fcafdabb514..315b375a754d204bb1b675bb7b5f2ddb55a4e0d4 100644 (file)
--- a/ext/date/lib/unixtime2tm.c
+++ b/ext/date/lib/unixtime2tm.c
@@ -23,9 +23,9 @@
 #include <string.h>
 
 #if defined(_MSC_VER)
-#define PHP_LL_CONST(n) n ## i64
+#define TIMELIB_LL_CONST(n) n ## i64
 #else
-#define PHP_LL_CONST(n) n ## ll
+#define TIMELIB_LL_CONST(n) n ## ll
 #endif
 
 #include "datetime.h"
@@ -67,7 +67,7 @@ void timelib_unixtime2gmt(timelib_time* tm, timelib_sll ts)
                /* Guess why this might be for, it has to do with a pope ;-). It's also
                 * only valid for Great Brittain and it's colonies. It needs fixing for
                 * other locales. *sigh*, why is this crap so complex! */
-               if (ts <= PHP_LL_CONST(-6857352000)) {
+               if (ts <= TIMELIB_LL_CONST(-6857352000)) {
                        tmp_days -= 11;
                }