com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/intl/calendar/calendar_class.cpp
| From: | Nikita Popov | Date: | Fri, 25 Aug 2017 20:03:00 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/intl/calendar/calendar_class.cpp | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99161@lists.php.net to get a copy of this message | ||
Commit: 52e854f0abf6827818ac9bdaae7b0f335d85b6de
Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 25 Aug 2017 22:02:49 +0200
Parents: 3641ba4332549f863b24f7190d4573525c936389 be9edd83c2b3119018611e178da0ee55f7b71c28
Branches: PHP-7.1 PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=52e854f0abf6827818ac9bdaae7b0f335d85b6de
Log:
Merge branch 'PHP-7.0' into PHP-7.1
Changed paths:
MM NEWS
MM ext/intl/calendar/calendar_class.cpp
Diff:
diff --cc ext/intl/calendar/calendar_class.cpp
index a2024c0,94a2d5a..e9c817a
--- a/ext/intl/calendar/calendar_class.cpp
+++ b/ext/intl/calendar/calendar_class.cpp
@@@ -467,19 -474,9 +467,8 @@@ void calendar_register_IntlCalendar_cla
Calendar_handlers.offset = XtOffsetOf(Calendar_object, zo);
Calendar_handlers.clone_obj = Calendar_clone_obj;
Calendar_handlers.get_debug_info = Calendar_get_debug_info;
- Calendar_handlers.dtor_obj = Calendar_objects_dtor;
Calendar_handlers.free_obj = Calendar_objects_free;
- /* Create and register 'IntlGregorianCalendar' class. */
- INIT_CLASS_ENTRY(ce, "IntlGregorianCalendar", GregorianCalendar_class_functions);
- GregorianCalendar_ce_ptr = zend_register_internal_class_ex(&ce,
- Calendar_ce_ptr);
- if (!GregorianCalendar_ce_ptr) {
- //can't happen know without bigger problems before
- php_error_docref0(NULL, E_ERROR,
- "IntlGregorianCalendar: class registration has failed.");
- return;
- }
-
/* Declare 'IntlCalendar' class constants */
#define CALENDAR_DECL_LONG_CONST(name, val) \
zend_declare_class_constant_long(Calendar_ce_ptr, name, sizeof(name) - 1, \