diff options
| author | Nikita Popov <nikic@php.net> | 2015-12-10 22:22:49 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-12-10 22:22:49 +0100 |
| commit | 04e3d82b5597630cc0a4ccdbafb75a4750c6506e (patch) | |
| tree | 99158c97e308eed4e703eafc53fad6abf23ac29b /ext/intl/calendar | |
| parent | 8e5e3301a1b9f685452f8709411674f3812b2a2d (diff) | |
| download | php-git-04e3d82b5597630cc0a4ccdbafb75a4750c6506e.tar.gz | |
Make duplicate class constant error for internal class
And drop two duplicate constant declarations from intl. These
were leaking previously.
Diffstat (limited to 'ext/intl/calendar')
| -rw-r--r-- | ext/intl/calendar/calendar_class.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/intl/calendar/calendar_class.cpp b/ext/intl/calendar/calendar_class.cpp index 6b6feef8d9..1f3a68b802 100644 --- a/ext/intl/calendar/calendar_class.cpp +++ b/ext/intl/calendar/calendar_class.cpp @@ -505,8 +505,6 @@ void calendar_register_IntlCalendar_class(void) CALENDAR_DECL_LONG_CONST("FIELD_AM_PM", UCAL_AM_PM); CALENDAR_DECL_LONG_CONST("FIELD_HOUR", UCAL_HOUR); CALENDAR_DECL_LONG_CONST("FIELD_HOUR_OF_DAY", UCAL_HOUR_OF_DAY); - CALENDAR_DECL_LONG_CONST("FIELD_HOUR", UCAL_HOUR); - CALENDAR_DECL_LONG_CONST("FIELD_HOUR_OF_DAY", UCAL_HOUR_OF_DAY); CALENDAR_DECL_LONG_CONST("FIELD_MINUTE", UCAL_MINUTE); CALENDAR_DECL_LONG_CONST("FIELD_SECOND", UCAL_SECOND); CALENDAR_DECL_LONG_CONST("FIELD_MILLISECOND", UCAL_MILLISECOND); |