Skip to content

Commit 9e6ddd0

Browse files
committed
squash! gettext: always use UTF-8 on native Windows
In this developers' setup, HAVE_LIBCHARSET_H is apparently defined, but we *really* want to override the locale_charset() here. Reminder: at the next merging rebase, fix the ACP typo as requested by Karsten.
1 parent d846717 commit 9e6ddd0

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

gettext.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
#ifndef NO_GETTEXT
1111
# include <locale.h>
1212
# include <libintl.h>
13-
# ifdef HAVE_LIBCHARSET_H
14-
# include <libcharset.h>
15-
# elif defined GIT_WINDOWS_NATIVE
13+
# if defined GIT_WINDOWS_NATIVE
1614
# define locale_charset() "UTF-8"
15+
# elif defined HAVE_LIBCHARSET_H
16+
# include <libcharset.h>
1717
# else
1818
# include <langinfo.h>
1919
# define locale_charset() nl_langinfo(CODESET)

0 commit comments

Comments
 (0)