* libc/locale/locale.c: Drop Cygwin-specific windows.h include.

(loadlocale): Call __set_charset_from_codepage with 0 codepage.
This commit is contained in:
Corinna Vinschen 2009-09-23 17:19:00 +00:00
parent 8e3607fcee
commit c1754722ee
2 changed files with 6 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2009-09-23 Corinna Vinschen <corinna@vinschen.de>
* libc/locale/locale.c: Drop Cygwin-specific windows.h include.
(loadlocale): Call __set_charset_from_codepage with 0 codepage.
2009-09-22 Ralf Corsépius <ralf.corsepius@rtems.org> 2009-09-22 Ralf Corsépius <ralf.corsepius@rtems.org>
* libc/include/stdlib.h: Add posix_memalign. * libc/include/stdlib.h: Add posix_memalign.

View File

@ -166,9 +166,6 @@ No supporting OS subroutines are required.
#include <stdlib.h> #include <stdlib.h>
#include <wchar.h> #include <wchar.h>
#include "../stdlib/local.h" #include "../stdlib/local.h"
#ifdef __CYGWIN__
#include <windows.h>
#endif
#define _LC_LAST 7 #define _LC_LAST 7
#define ENCODING_LEN 31 #define ENCODING_LEN 31
@ -468,7 +465,7 @@ loadlocale(struct _reent *p, int category)
else if (c[0] == '\0' || c[0] == '@') else if (c[0] == '\0' || c[0] == '@')
/* End of string or just a modifier */ /* End of string or just a modifier */
#ifdef __CYGWIN__ #ifdef __CYGWIN__
__set_charset_from_codepage (GetACP (), charset); __set_charset_from_codepage (0, charset);
#else #else
strcpy (charset, "ISO-8859-1"); strcpy (charset, "ISO-8859-1");
#endif #endif