Nuke PHP_ prefix from timelib

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

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>

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

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

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;
 		}