edink Wed Jun 15 05:02:28 2005 EDT
Modified files:
/php-src/ext/date/lib parse_tz.c timelib_structs.h unixtime2tm.c
/php-src/ext/date/lib/resource parse_date.re
Log:
Nuke PHP_ prefix from timelib
http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_tz.c?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/date/lib/parse_tz.c
diff -u php-src/ext/date/lib/parse_tz.c:1.2 php-src/ext/date/lib/parse_tz.c:1.3
--- php-src/ext/date/lib/parse_tz.c:1.2 Tue Jun 14 20:11:29 2005
+++ php-src/ext/date/lib/parse_tz.c Wed Jun 15 05:02:28 2005
@@ -16,10 +16,10 @@
+----------------------------------------------------------------------+
*/
-/* $Id: parse_tz.c,v 1.2 2005/06/15 00:11:29 edink Exp $ */
+/* $Id: parse_tz.c,v 1.3 2005/06/15 09:02:28 edink Exp $ */
#include <stdio.h>
-#ifdef PHP_WIN32
+#ifdef WIN32
#include <winsock2.h>
#else
#include <netinet/in.h>
http://cvs.php.net/diff.php/php-src/ext/date/lib/timelib_structs.h?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/date/lib/timelib_structs.h
diff -u php-src/ext/date/lib/timelib_structs.h:1.3
php-src/ext/date/lib/timelib_structs.h:1.4
--- php-src/ext/date/lib/timelib_structs.h:1.3 Wed Jun 15 03:23:27 2005
+++ php-src/ext/date/lib/timelib_structs.h Wed Jun 15 05:02:28 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: timelib_structs.h,v 1.3 2005/06/15 07:23:27 derick Exp $ */
+/* $Id: timelib_structs.h,v 1.4 2005/06/15 09:02:28 edink Exp $ */
#ifndef __TIMELIB_STRUCTS_H__
#define __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
http://cvs.php.net/diff.php/php-src/ext/date/lib/unixtime2tm.c?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/date/lib/unixtime2tm.c
diff -u php-src/ext/date/lib/unixtime2tm.c:1.2
php-src/ext/date/lib/unixtime2tm.c:1.3
--- php-src/ext/date/lib/unixtime2tm.c:1.2 Tue Jun 14 20:11:29 2005
+++ php-src/ext/date/lib/unixtime2tm.c Wed Jun 15 05:02:28 2005
@@ -16,16 +16,16 @@
+----------------------------------------------------------------------+
*/
-/* $Id: unixtime2tm.c,v 1.2 2005/06/15 00:11:29 edink Exp $ */
+/* $Id: unixtime2tm.c,v 1.3 2005/06/15 09:02:28 edink Exp $ */
#include <stdlib.h>
#include <stdio.h>
#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 @@
/* 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;
}
http://cvs.php.net/diff.php/php-src/ext/date/lib/resource/parse_date.re?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/date/lib/resource/parse_date.re
diff -u php-src/ext/date/lib/resource/parse_date.re:1.4
php-src/ext/date/lib/resource/parse_date.re:1.5
--- php-src/ext/date/lib/resource/parse_date.re:1.4 Wed Jun 15 03:58:21 2005
+++ php-src/ext/date/lib/resource/parse_date.re Wed Jun 15 05:02:28 2005
@@ -16,14 +16,14 @@
+----------------------------------------------------------------------+
*/
-/* $Id: parse_date.re,v 1.4 2005/06/15 07:58:21 derick Exp $ */
+/* $Id: parse_date.re,v 1.5 2005/06/15 09:02:28 edink Exp $ */
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "datetime.h"
-#ifdef PHP_WIN32
+#if defined(_MSC_VER)
#define strcasecmp stricmp
#define strtoll(s, f, b) _atoi64(s)
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
