diff options
| author | ache <ache@FreeBSD.org> | 2000-06-03 12:24:08 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2000-06-03 12:24:08 +0000 |
| commit | 50dddc0919baff9cbacfd717c0dedf5b21688989 (patch) | |
| tree | c1c5d98ac56ccd0648a552f37c3d4ac3a24db391 /lib/libc/locale/setlocale.c | |
| parent | f8cc8650700e82a6bf297d84634dd12a616d0209 (diff) | |
| download | FreeBSD-src-50dddc0919baff9cbacfd717c0dedf5b21688989.zip FreeBSD-src-50dddc0919baff9cbacfd717c0dedf5b21688989.tar.gz | |
Megre XPG4 code into libc
Diffstat (limited to 'lib/libc/locale/setlocale.c')
| -rw-r--r-- | lib/libc/locale/setlocale.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c index 179be54..f5f5fae 100644 --- a/lib/libc/locale/setlocale.c +++ b/lib/libc/locale/setlocale.c @@ -96,10 +96,6 @@ static int stub_load_locale __P((const char *)); extern int __time_load_locale __P((const char *)); /* strftime.c */ -#ifdef XPG4 -extern int _xpg4_setrunelocale __P((char *)); -#endif - char * setlocale(category, locale) int category; @@ -243,18 +239,10 @@ loadlocale(category) return (old); if (category == LC_CTYPE) { -#ifdef XPG4 - ret = _xpg4_setrunelocale(new) ? NULL : new; -#else ret = setrunelocale(new) ? NULL : new; -#endif - if (!ret) { -#ifdef XPG4 - (void)_xpg4_setrunelocale(old); -#else + if (!ret) (void)setrunelocale(old); -#endif - } else + else (void)strcpy(old, new); return (ret); } |
