derick Tue Jul 18 12:37:49 2006 UTC
Modified files:
/php-src/ext/date php_date.c php_date.h
Log:
- Enable all methods in the already existing Date and Timezone classes
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.105&r2=1.106&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.105 php-src/ext/date/php_date.c:1.106
--- php-src/ext/date/php_date.c:1.105 Mon Jul 10 11:25:59 2006
+++ php-src/ext/date/php_date.c Tue Jul 18 12:37:49 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.105 2006/07/10 11:25:59 tony2001 Exp $ */
+/* $Id: php_date.c,v 1.106 2006/07/18 12:37:49 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -166,7 +166,6 @@
PHP_FE(localtime, arginfo_localtime)
PHP_FE(getdate, arginfo_getdate)
-#ifdef EXPERIMENTAL_DATE_SUPPORT
/* Advanced Interface */
PHP_FE(date_create, NULL)
PHP_FE(date_parse, NULL)
@@ -188,7 +187,6 @@
PHP_FE(timezone_transistions_get, NULL)
PHP_FE(timezone_identifiers_list, NULL)
PHP_FE(timezone_abbreviations_list, NULL)
-#endif
/* Options and Configuration */
PHP_FE(date_default_timezone_set, arginfo_date_default_timezone_set)
@@ -203,7 +201,6 @@
zend_function_entry date_funcs_date[] = {
-#ifdef EXPERIMENTAL_DATE_SUPPORT
ZEND_NAMED_FE(format, ZEND_FN(date_format), NULL)
ZEND_NAMED_FE(modify, ZEND_FN(date_modify), NULL)
ZEND_NAMED_FE(getTimezone, ZEND_FN(date_timezone_get), NULL)
@@ -212,18 +209,15 @@
ZEND_NAMED_FE(setTime, ZEND_FN(date_time_set), NULL)
ZEND_NAMED_FE(setDate, ZEND_FN(date_date_set), NULL)
ZEND_NAMED_FE(setISODate, ZEND_FN(date_isodate_set), NULL)
-#endif
{NULL, NULL, NULL}
};
zend_function_entry date_funcs_timezone[] = {
-#ifdef EXPERIMENTAL_DATE_SUPPORT
ZEND_NAMED_FE(getName, ZEND_FN(timezone_name_get), NULL)
ZEND_NAMED_FE(getOffset, ZEND_FN(timezone_offset_get), NULL)
ZEND_NAMED_FE(getTransistions, ZEND_FN(timezone_transistions_get), NULL)
ZEND_FENTRY(listAbbreviations, zif_timezone_abbreviations_list, NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
ZEND_FENTRY(listIdentifiers, zif_timezone_identifiers_list, NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
{NULL, NULL, NULL}
};
@@ -275,7 +269,6 @@
timelib_tzinfo *tz;
};
-#ifdef EXPERIMENTAL_DATE_SUPPORT
#define DATE_SET_CONTEXT \
zval *object; \
object = getThis(); \
@@ -294,8 +287,6 @@
} \
obj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC);
\
-#endif
-
static void date_object_free_storage_date(void *object TSRMLS_DC);
static void date_object_free_storage_timezone(void *object TSRMLS_DC);
static zend_object_value date_object_new_date(zend_class_entry *class_type
TSRMLS_DC);
@@ -1655,7 +1646,6 @@
efree(object);
}
-#ifdef EXPERIMENTAL_DATE_SUPPORT
/* Advanced Interface */
static zval * date_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC)
{
@@ -2149,7 +2139,6 @@
entry++;
} while (entry->name);
}
-#endif
/* {{{ proto bool date_default_timezone_set(string timezone_identifier)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.h?r1=1.29&r2=1.30&diff_format=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.29 php-src/ext/date/php_date.h:1.30
--- php-src/ext/date/php_date.h:1.29 Sat Apr 8 14:57:41 2006
+++ php-src/ext/date/php_date.h Tue Jul 18 12:37:49 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.h,v 1.29 2006/04/08 14:57:41 derick Exp $ */
+/* $Id: php_date.h,v 1.30 2006/07/18 12:37:49 derick Exp $ */
#ifndef PHP_DATE_H
#define PHP_DATE_H
@@ -46,7 +46,6 @@
PHP_FUNCTION(localtime);
PHP_FUNCTION(getdate);
-#ifdef EXPERIMENTAL_DATE_SUPPORT
/* Advanced Interface */
PHP_FUNCTION(date_create);
PHP_FUNCTION(date_parse);
@@ -71,7 +70,6 @@
PHP_METHOD(timezone, identifiers_list);
PHP_METHOD(timezone, abbreviations_list);
-#endif
/* Options and Configuration */
PHP_FUNCTION(date_default_timezone_set);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
