summaryrefslogtreecommitdiff
path: root/ext/date/lib
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2005-06-16 17:12:41 +0000
committerDerick Rethans <derick@php.net>2005-06-16 17:12:41 +0000
commit4ad939be1bd37c9993db8cfb2becff5fa9484e48 (patch)
tree7aa1a8d90907840901ab369f0c2217d394055479 /ext/date/lib
parent34e0ba1f9271d971aa9dfb4d9a13f7c56c59e0f2 (diff)
downloadphp-git-4ad939be1bd37c9993db8cfb2becff5fa9484e48.tar.gz
- Rename "datetime.c" and "datetime.h" to "timelib.c" and "timelib.h" to
prevent duplicate header names.
Diffstat (limited to 'ext/date/lib')
-rw-r--r--ext/date/lib/parse_date.c2
-rw-r--r--ext/date/lib/parse_date.re2
-rw-r--r--ext/date/lib/parse_tz.c2
-rw-r--r--ext/date/lib/resource/parse_date.re2
-rw-r--r--ext/date/lib/timelib.c (renamed from ext/date/lib/datetime.c)2
-rw-r--r--ext/date/lib/timelib.h (renamed from ext/date/lib/datetime.h)2
-rw-r--r--ext/date/lib/tm2unixtime.c2
-rw-r--r--ext/date/lib/unixtime2tm.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index 25f5f6e1fd..da9da38d3a 100644
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include "datetime.h"
+#include "timelib.h"
#if defined(_MSC_VER)
#define strcasecmp stricmp
diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index 7e4b55a494..22c3b24d7d 100644
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include "datetime.h"
+#include "timelib.h"
#if defined(_MSC_VER)
#define strcasecmp stricmp
diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
index 0bfdd2622b..8792747836 100644
--- a/ext/date/lib/parse_tz.c
+++ b/ext/date/lib/parse_tz.c
@@ -26,7 +26,7 @@
#endif
#include <string.h>
-#include "datetime.h"
+#include "timelib.h"
#include "timezonedb.h"
static void read_header(char **tzf, timelib_tzinfo *tz)
diff --git a/ext/date/lib/resource/parse_date.re b/ext/date/lib/resource/parse_date.re
index 7e4b55a494..22c3b24d7d 100644
--- a/ext/date/lib/resource/parse_date.re
+++ b/ext/date/lib/resource/parse_date.re
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include "datetime.h"
+#include "timelib.h"
#if defined(_MSC_VER)
#define strcasecmp stricmp
diff --git a/ext/date/lib/datetime.c b/ext/date/lib/timelib.c
index 905a94538a..f5fb5e0b16 100644
--- a/ext/date/lib/datetime.c
+++ b/ext/date/lib/timelib.c
@@ -19,7 +19,7 @@
/* $Id$ */
#include "timelib_structs.h"
-#include "datetime.h"
+#include "timelib.h"
#include <ctype.h>
#define TIMELIB_TIME_FREE(m) \
diff --git a/ext/date/lib/datetime.h b/ext/date/lib/timelib.h
index dd8320bdbf..affc6f6ace 100644
--- a/ext/date/lib/datetime.h
+++ b/ext/date/lib/timelib.h
@@ -54,7 +54,7 @@ timelib_tzinfo *timelib_parse_tzfile(char *timezone);
int timelib_timestamp_is_in_dst(timelib_sll ts, timelib_tzinfo *tz);
timelib_time_offset *timelib_get_time_zone_info(timelib_sll ts, timelib_tzinfo *tz);
-/* From datetime.c */
+/* From timelib.c */
timelib_tzinfo* timelib_tzinfo_ctor();
void timelib_time_tz_abbr_update(timelib_time* tm, char* tz_abbr);
void timelib_time_tz_name_update(timelib_time* tm, char* tz_name);
diff --git a/ext/date/lib/tm2unixtime.c b/ext/date/lib/tm2unixtime.c
index 9a56e8b3f2..12f621112e 100644
--- a/ext/date/lib/tm2unixtime.c
+++ b/ext/date/lib/tm2unixtime.c
@@ -18,7 +18,7 @@
/* $Id$ */
-#include "datetime.h"
+#include "timelib.h"
/* jan feb mrt apr may jun jul aug sep oct nov dec */
static int month_tab_leap[12] = { -1, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 };
diff --git a/ext/date/lib/unixtime2tm.c b/ext/date/lib/unixtime2tm.c
index 315b375a75..e8b8078a88 100644
--- a/ext/date/lib/unixtime2tm.c
+++ b/ext/date/lib/unixtime2tm.c
@@ -28,7 +28,7 @@
#define TIMELIB_LL_CONST(n) n ## ll
#endif
-#include "datetime.h"
+#include "timelib.h"
static int month_tab_leap[12] = { -1, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 };
static int month_tab[12] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 };