diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-06-28 04:19:22 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-06-28 04:19:22 +0200 |
| commit | c4f76880e9589a757a194c19a4526599dfe71f50 (patch) | |
| tree | c66def0aa296e781c51dfc51c8bba9d8ac51189b /lib/localcharset.c | |
| parent | 76ef1d8e3249e82a6965fd17157bee00a7857ff3 (diff) | |
| parent | 7b65dbd4ebade81d504cfe5e681292a58ad1fdf0 (diff) | |
Update upstream source from tag 'upstream/0.9.10'
Update to upstream version '0.9.10'
with Debian dir 9736048cfd7ea97640dba10ba42a3839100c5694
Diffstat (limited to 'lib/localcharset.c')
| -rw-r--r-- | lib/localcharset.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/localcharset.c b/lib/localcharset.c index 88efbac..14b9cba 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -41,7 +41,7 @@ # define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */ #endif -#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ +#if defined _WIN32 && !defined __CYGWIN__ # define WINDOWS_NATIVE # include <locale.h> #endif @@ -97,7 +97,7 @@ # define O_NOFOLLOW 0 #endif -#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ +#if defined _WIN32 || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ /* Native Windows, Cygwin, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') #endif @@ -271,8 +271,10 @@ get_charset_aliases (void) # if defined DARWIN7 /* To avoid the trouble of installing a file that is shared by many GNU packages -- many packaging systems have problems with this --, - simply inline the aliases here. */ - cp = "ISO8859-1" "\0" "ISO-8859-1" "\0" + simply inline the aliases here. + For speed, map the most frequent case first. */ + cp = "UTF-8" "\0" "UTF-8" "\0" + "ISO8859-1" "\0" "ISO-8859-1" "\0" "ISO8859-2" "\0" "ISO-8859-2" "\0" "ISO8859-4" "\0" "ISO-8859-4" "\0" "ISO8859-5" "\0" "ISO-8859-5" "\0" |