- Rename "datetime.c" and "datetime.h" to "timelib.c" and "timelib.h" to

  prevent duplicate header names.

diff --git a/ext/date/config.m4 b/ext/date/config.m4
index 6bccc5f323f6243d6565e7a618bed902d2e2750a..8eb9e6fd928ac7bf7fcd194303a18ea2d00fd397 100644 (file)
--- a/ext/date/config.m4
+++ b/ext/date/config.m4
@@ -1,5 +1,5 @@
 dnl $Id$
 dnl config.m4 for date extension
 
-PHP_NEW_EXTENSION(date, php_date.c lib/datetime.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c)
+PHP_NEW_EXTENSION(date, php_date.c lib/timelib.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c)
 PHP_ADD_BUILD_DIR([$ext_builddir/lib])

diff --git a/ext/date/config.w32 b/ext/date/config.w32
index 35fcb7aac6a6c32d86b38efb2d5234e16e6a31d0..d307bb73d8898eb516468de68ad24bb36575d8de 100755 (executable)
--- a/ext/date/config.w32
+++ b/ext/date/config.w32
@@ -2,5 +2,5 @@
 // vim:ft=javascript
 
 EXTENSION("date", "php_date.c", false, "-Iext/date/lib");
-ADD_SOURCES("ext/date/lib", "datetime.c dow.c parse_date.c parse_tz.c tm2unixtime.c unixtime2tm.c", "date");
+ADD_SOURCES("ext/date/lib", "timelib.c dow.c parse_date.c parse_tz.c tm2unixtime.c unixtime2tm.c", "date");
 AC_DEFINE('HAVE_DATE', 1, 'Have date/time support');

diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index 25f5f6e1fde00b99a215767601be9759d249a999..da9da38d3a2aee26edaf3bca22953a8b4665371d 100644 (file)
--- 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 7e4b55a494d0ea1692adb888727206b105058d11..22c3b24d7d1e4142f9db0a3b13857a08ca2d0213 100644 (file)
--- 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 0bfdd2622bba3aa6178cbe68f4c38dabb6b7603f..879274783657cb6ecad1d8985f711ee43f8aead6 100644 (file)
--- 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 7e4b55a494d0ea1692adb888727206b105058d11..22c3b24d7d1e4142f9db0a3b13857a08ca2d0213 100644 (file)
--- 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
similarity index 99%
rename from ext/date/lib/datetime.c
rename to ext/date/lib/timelib.c
index 905a94538a147c99b51b70411a9cc4764277d8e2..f5fb5e0b16528e02d40044de00de61063f735969 100644 (file)
--- 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
similarity index 99%
rename from ext/date/lib/datetime.h
rename to ext/date/lib/timelib.h
index dd8320bdbfe55f9001571e7191ab190e8c24e9a9..affc6f6ace3516717fd62e1770bcd5cd4cc84916 100644 (file)
--- 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 9a56e8b3f2f9533427d48f768fec213cb6bff808..12f621112e5216d8f673639eba3b378315e0593a 100644 (file)
--- 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 315b375a754d204bb1b675bb7b5f2ddb55a4e0d4..e8b8078a88e18bd76639b2487faf4948098a246d 100644 (file)
--- 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 };

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 35e13c66e5fc685f156c5f4204cefb6e7cc155f9..744342bb9d9c8faee36f2da33b4cf73439f01b4b 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -26,7 +26,7 @@
 #include "ext/standard/info.h"
 #include "php_date.h"
 #include "lib/timelib_structs.h"
-#include "lib/datetime.h"
+#include "lib/timelib.h"
 #include <time.h>
 
 function_entry date_functions[] = {