From 9e6ddd0b5fab0256fb8b1d44e12ff4769de756c2 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 10 Apr 2015 00:40:01 +0100 Subject: [PATCH] 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. --- gettext.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gettext.c b/gettext.c index 3741025812..af9be12af5 100644 --- a/gettext.c +++ b/gettext.c @@ -10,10 +10,10 @@ #ifndef NO_GETTEXT # include # include -# ifdef HAVE_LIBCHARSET_H -# include -# elif defined GIT_WINDOWS_NATIVE +# if defined GIT_WINDOWS_NATIVE # define locale_charset() "UTF-8" +# elif defined HAVE_LIBCHARSET_H +# include # else # include # define locale_charset() nl_langinfo(CODESET)