- Reorganize headers, and update TODO.

7 files changed, 6 insertions, 14 deletions

diff --git a/ext/date/TODO b/ext/date/TODO
index 4c625d0b7d..1daae52dff 100644
--- a/ext/date/TODO
+++ b/ext/date/TODO
@@ -1,6 +1,6 @@
 - Port over my 200 test cases to .phpt format.
 - Write an error handler for unexpected characters while parsing dates.
 - Cache lookups for timezone information.
-- Change tz structure lookup to use binary search.
 - Move all date/time related functions from ext/standard to ext/date.
 - Move all date/time related tests from ext/standard/tests to ext/data/tests.
+- Optimize parsing @ with a negative timestamp.
diff --git a/ext/date/lib/dow.c b/ext/date/lib/dow.c
index 3a3b6bf368..eaa3165cd5 100644
--- a/ext/date/lib/dow.c
+++ b/ext/date/lib/dow.c
@@ -18,9 +18,7 @@
 
 /* $Id$ */
 
-#include <timelib_config.h>
-
-#include "timelib_structs.h"
+#include "timelib.h"
 
 static int m_table_common[13] = { -1, 0, 3, 3, 6, 1, 4, 6, 2, 5, 0, 3, 5 }; /* 1 = jan */
 static int m_table_leap[13] =   { -1, 6, 2, 3, 6, 1, 4, 6, 2, 5, 0, 3, 5 }; /* 1 = jan */
diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
index 11df4d92ae..79e8f621a9 100644
--- a/ext/date/lib/parse_tz.c
+++ b/ext/date/lib/parse_tz.c
@@ -18,7 +18,7 @@
 
 /* $Id$ */
 
-#include <timelib_config.h>
+#include "timelib.h"
 
 #include <stdio.h>
 
@@ -27,8 +27,6 @@
 #else
 #include <strings.h>
 #endif
-
-#include "timelib.h"
 #include "timezonedb.h"
 
 #ifdef WORDS_BIGENDIAN
diff --git a/ext/date/lib/timelib.c b/ext/date/lib/timelib.c
index 1ab0a49fea..576b2e2efc 100644
--- a/ext/date/lib/timelib.c
+++ b/ext/date/lib/timelib.c
@@ -18,9 +18,6 @@
 
 /* $Id$ */
 
-#include <timelib_config.h>
-
-#include "timelib_structs.h"
 #include "timelib.h"
 #include <ctype.h>
 
diff --git a/ext/date/lib/timelib_structs.h b/ext/date/lib/timelib_structs.h
index 068f8b8a65..8590e47f69 100644
--- a/ext/date/lib/timelib_structs.h
+++ b/ext/date/lib/timelib_structs.h
@@ -21,6 +21,8 @@
 #ifndef __TIMELIB_STRUCTS_H__
 #define __TIMELIB_STRUCTS_H__
 
+#include <timelib_config.h>
+
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
diff --git a/ext/date/lib/tm2unixtime.c b/ext/date/lib/tm2unixtime.c
index 22b739708b..e67df46f2a 100644
--- a/ext/date/lib/tm2unixtime.c
+++ b/ext/date/lib/tm2unixtime.c
@@ -18,7 +18,6 @@
 
 /* $Id$ */
 
-#include <timelib_config.h>
 #include "timelib.h"
 
 /*                                    jan  feb  mrt  apr  may  jun  jul  aug  sep  oct  nov  dec */
diff --git a/ext/date/lib/unixtime2tm.c b/ext/date/lib/unixtime2tm.c
index b6c2cc0b73..169cce0c93 100644
--- a/ext/date/lib/unixtime2tm.c
+++ b/ext/date/lib/unixtime2tm.c
@@ -18,7 +18,7 @@
 
 /* $Id$ */
 
-#include <timelib_config.h>
+#include "timelib.h"
 
 #include <stdio.h>
 
@@ -38,8 +38,6 @@
 #define TIMELIB_LL_CONST(n) n ## ll
 #endif
 
-#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 };