diff options
| author | Edin Kadribasic <edink@php.net> | 2005-06-15 09:02:28 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2005-06-15 09:02:28 +0000 |
| commit | cc33e8f5363861916100de8d9aa1de0f402d7f5d (patch) | |
| tree | 07d533ef26fffda105b0b49e0b331c58e061906c | |
| parent | d1974bad1b1e287d8fb3210a817fffe187a0aa78 (diff) | |
| download | php-git-cc33e8f5363861916100de8d9aa1de0f402d7f5d.tar.gz | |
Nuke PHP_ prefix from timelib
| -rw-r--r-- | ext/date/lib/parse_date.re | 2 | ||||
| -rw-r--r-- | ext/date/lib/parse_tz.c | 2 | ||||
| -rw-r--r-- | ext/date/lib/resource/parse_date.re | 2 | ||||
| -rw-r--r-- | ext/date/lib/timelib_structs.h | 4 | ||||
| -rw-r--r-- | ext/date/lib/unixtime2tm.c | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re index a5d5b591e6..dd383e6c9a 100644 --- 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 f5eac2aeac..6e98a1b9d5 100644 --- 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 a5d5b591e6..dd383e6c9a 100644 --- 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 f3bf325091..52dc21bf21 100644 --- 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 a198b405a9..315b375a75 100644 --- 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; } |