diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2024-12-24 11:42:15 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu.nakada@gmail.com> | 2024-12-24 13:25:55 +0900 |
| commit | fb82f3a632fa07dd270ed188cd6ce751ecabcb84 (patch) | |
| tree | a89f58d4b453fec81791cac6d341f2f3eb102f8f /win32 | |
| parent | 42026ec3da6acb2c398bea8c8dc97103a7c936ec (diff) | |
Win32: Defer change of timezone name encoding after 3.4
This change will be merged into 3.5 along with other encoding, command
line, environment variables, etc.
Revert following commits:
- bd831bcca534955533d9135d8c2f22d7ae5b9aa8
[Bug #20929] Win32: Use `wcsftime`
- 1c15f641cc2bb88fa88123a11036ed58fbf9aa6d
[Bug #20929] Win32: Encode timezone name in UTF-8
- 78762b52185aa80ee55c0d49b495aceed863dce2
[Bug #20929] Fix `assert_zone_encoding`
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/12448
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index e4c64ad1b4..826e4ac10f 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -785,7 +785,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define HAVE_STRUCT_TIMEVAL 1 !if $(MSC_VER) >= 1900 #define HAVE_STRUCT_TIMESPEC -#define HAVE_LOCALE_H 1 !endif !if $(MSC_VER) >= 1600 #define HAVE_INTTYPES_H 1 |