diff options
| author | Remi Collet <remi@remirepo.net> | 2021-06-08 14:47:07 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-06-08 14:47:07 +0200 |
| commit | 9ebae8c4b7d6e3a1f9b2101c2fc1c498637b1a8d (patch) | |
| tree | 40802f4091c3d746ad3547c5f013196fc0578f98 /php-8.1.0-systzdata-v20.patch | |
| parent | 81f8123a651c20023eaca8fae5b41b2c4390809a (diff) | |
cleanup / reorder
Diffstat (limited to 'php-8.1.0-systzdata-v20.patch')
| -rw-r--r-- | php-8.1.0-systzdata-v20.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/php-8.1.0-systzdata-v20.patch b/php-8.1.0-systzdata-v20.patch index a2e3827..155cdac 100644 --- a/php-8.1.0-systzdata-v20.patch +++ b/php-8.1.0-systzdata-v20.patch @@ -92,7 +92,7 @@ diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata php-8.0.0beta3/ext/dat /* read ID */ version = (*tzf)[3] - '0'; *tzf += 4; -@@ -566,7 +584,429 @@ void timelib_dump_tzinfo(timelib_tzinfo +@@ -577,7 +595,429 @@ void timelib_dump_tzinfo(timelib_tzinfo } } @@ -523,7 +523,7 @@ diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata php-8.0.0beta3/ext/dat { int left = 0, right = tzdb->index_size - 1; -@@ -592,9 +1032,48 @@ static int seek_to_tz_position(const uns +@@ -603,9 +1043,48 @@ static int seek_to_tz_position(const uns return 0; } @@ -572,7 +572,7 @@ diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata php-8.0.0beta3/ext/dat } const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count) -@@ -606,7 +1085,30 @@ const timelib_tzdb_index_entry *timelib_ +@@ -617,7 +1096,30 @@ const timelib_tzdb_index_entry *timelib_ int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb) { const unsigned char *tzf; @@ -604,7 +604,7 @@ diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata php-8.0.0beta3/ext/dat } static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) -@@ -651,6 +1153,8 @@ static timelib_tzinfo* timelib_tzinfo_ct +@@ -662,6 +1164,8 @@ static timelib_tzinfo* timelib_tzinfo_ct timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code) { const unsigned char *tzf; @@ -613,7 +613,7 @@ diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata php-8.0.0beta3/ext/dat timelib_tzinfo *tmp; int version; int transitions_result, types_result; -@@ -658,7 +1162,7 @@ timelib_tzinfo *timelib_parse_tzfile(con +@@ -669,7 +1173,7 @@ timelib_tzinfo *timelib_parse_tzfile(con *error_code = TIMELIB_ERROR_NO_ERROR; @@ -622,7 +622,7 @@ diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata php-8.0.0beta3/ext/dat tmp = timelib_tzinfo_ctor(timezone); version = read_preamble(&tzf, tmp, &type); -@@ -699,11 +1203,36 @@ timelib_tzinfo *timelib_parse_tzfile(con +@@ -712,11 +1216,36 @@ timelib_tzinfo *timelib_parse_tzfile(con return NULL; } |