diff options
author | ache <ache@FreeBSD.org> | 1997-09-25 23:18:10 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 1997-09-25 23:18:10 +0000 |
commit | 5405cc0bbaf224dcc9aed79099d8705351dbfef0 (patch) | |
tree | beaa6e8f05061ee71d88e42b0d502a8a5aacb8af /lib | |
parent | 9021e21701a5ca6889ebea04001c1dfc47a8dae9 (diff) | |
download | FreeBSD-src-5405cc0bbaf224dcc9aed79099d8705351dbfef0.zip FreeBSD-src-5405cc0bbaf224dcc9aed79099d8705351dbfef0.tar.gz |
Move MSKanji under XPG4 define
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libc/locale/setrunelocale.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c index 627261b..2d94e75 100644 --- a/lib/libc/locale/setrunelocale.c +++ b/lib/libc/locale/setrunelocale.c @@ -47,9 +47,9 @@ extern int _none_init __P((_RuneLocale *)); #ifdef XPG4 extern int _UTF2_init __P((_RuneLocale *)); extern int _EUC_init __P((_RuneLocale *)); +extern int _MSKanji_init __P((_RuneLocale *)); extern int _xpg4_setrunelocale __P((char *)); #endif -extern int _MSKanji_init __P((_RuneLocale *)); extern _RuneLocale *_Read_RuneMagi __P((FILE *)); #ifdef XPG4 @@ -113,21 +113,21 @@ _xpg4_setrunelocale(encoding) fclose(fp); #ifdef XPG4 - if (!rl->encoding[0] || !strcmp(rl->encoding, "UTF2")) { + if (!rl->encoding[0] || !strcmp(rl->encoding, "UTF2")) return(_UTF2_init(rl)); #else - if (!rl->encoding[0]) { + if (!rl->encoding[0]) return(EINVAL); #endif - } else if (!strcmp(rl->encoding, "NONE")) { + else if (!strcmp(rl->encoding, "NONE")) return(_none_init(rl)); #ifdef XPG4 - } else if (!strcmp(rl->encoding, "EUC")) { + else if (!strcmp(rl->encoding, "EUC")) return(_EUC_init(rl)); -#endif - } else if (!strcmp(rl->encoding, "MSKanji")) { + else if (!strcmp(rl->encoding, "MSKanji")) return(_MSKanji_init(rl)); - } else +#endif + else return(EINVAL); } |