Skip to content

Commit fa2db85

Browse files
committed
Merge branch 'gettext-force-utf-8-on-windows'
The idea of the C runtime on Windows as to what a locale is does not mesh well with the idea Git has. So let's just ignore the C runtime. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents 0f1de7f + c99c41f commit fa2db85

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

gettext.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
#ifndef NO_GETTEXT
1313
# include <locale.h>
1414
# include <libintl.h>
15-
# ifdef HAVE_LIBCHARSET_H
15+
# ifdef GIT_WINDOWS_NATIVE
16+
# define locale_charset() "UTF-8"
17+
# elif defined HAVE_LIBCHARSET_H
1618
# include <libcharset.h>
1719
# else
1820
# include <langinfo.h>

0 commit comments

Comments
 (0)