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.
This commit is contained in:
Johannes Schindelin
2015-04-10 00:40:01 +01:00
parent d8467171eb
commit 9e6ddd0b5f

View File

@@ -10,10 +10,10 @@
#ifndef NO_GETTEXT
# include <locale.h>
# include <libintl.h>
# ifdef HAVE_LIBCHARSET_H
# include <libcharset.h>
# elif defined GIT_WINDOWS_NATIVE
# if defined GIT_WINDOWS_NATIVE
# define locale_charset() "UTF-8"
# elif defined HAVE_LIBCHARSET_H
# include <libcharset.h>
# else
# include <langinfo.h>
# define locale_charset() nl_langinfo(CODESET)