mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
- Rename "datetime.c" and "datetime.h" to "timelib.c" and "timelib.h" to
prevent duplicate header names.
This commit is contained in:
parent
34e0ba1f92
commit
4ad939be1b
@ -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])
|
||||
|
@ -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');
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -19,7 +19,7 @@
|
||||
/* $Id$ */
|
||||
|
||||
#include "timelib_structs.h"
|
||||
#include "datetime.h"
|
||||
#include "timelib.h"
|
||||
#include <ctype.h>
|
||||
|
||||
#define TIMELIB_TIME_FREE(m) \
|
@ -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);
|
@ -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 };
|
||||
|
@ -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 };
|
||||
|
@ -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[] = {
|
||||
|
Loading…
Reference in New Issue
Block a user