Skip to content

Commit

Permalink
squash! gettext: always use UTF-8 on native Windows
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
dscho committed Apr 9, 2015
1 parent d846717 commit 9e6ddd0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions gettext.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 9e6ddd0

Please sign in to comment.