crt: Remove internal mb_wc_common.h and replace it by locale.h usage CRT header file locale.h is the correct one which provides declaration of ___lc_codepage_func function. Signed-off-by: Martin Storsjö <martin@martin.st>
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am index 498b673..d2347cc 100644 --- a/mingw-w64-crt/Makefile.am +++ b/mingw-w64-crt/Makefile.am
@@ -1114,7 +1114,6 @@ math/powi.def.h math/sqrt.def.h \ math/cephes_mconf.h math/fp_consts.h \ \ - misc/mb_wc_common.h \ misc/mingw_longjmp.S \ misc/mingw_getsp.S \ misc/alarm.c \
diff --git a/mingw-w64-crt/misc/btowc.c b/mingw-w64-crt/misc/btowc.c index caf2d95..2029edc 100644 --- a/mingw-w64-crt/misc/btowc.c +++ b/mingw-w64-crt/misc/btowc.c
@@ -6,7 +6,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include "mb_wc_common.h" +#include <locale.h> #include <limits.h> #include <wchar.h> #include <stdio.h>
diff --git a/mingw-w64-crt/misc/mb_wc_common.h b/mingw-w64-crt/misc/mb_wc_common.h deleted file mode 100644 index c640fb7..0000000 --- a/mingw-w64-crt/misc/mb_wc_common.h +++ /dev/null
@@ -1,9 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ - -#include <_mingw.h> - -unsigned int __cdecl ___lc_codepage_func(void);
diff --git a/mingw-w64-crt/misc/mbrtowc.c b/mingw-w64-crt/misc/mbrtowc.c index f53286e..200711c 100644 --- a/mingw-w64-crt/misc/mbrtowc.c +++ b/mingw-w64-crt/misc/mbrtowc.c
@@ -6,7 +6,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include "mb_wc_common.h" +#include <locale.h> #include <wchar.h> #include <stdlib.h> #include <errno.h>
diff --git a/mingw-w64-crt/misc/mingw_wcstold.c b/mingw-w64-crt/misc/mingw_wcstold.c index 2f66bee..407e169 100644 --- a/mingw-w64-crt/misc/mingw_wcstold.c +++ b/mingw-w64-crt/misc/mingw_wcstold.c
@@ -23,8 +23,6 @@ #include <string.h> #include <mbstring.h> -#include "mb_wc_common.h" - long double __mingw_wcstold (const wchar_t * __restrict__ wcs, wchar_t ** __restrict__ wcse) { char * cs;
diff --git a/mingw-w64-crt/misc/wcrtomb.c b/mingw-w64-crt/misc/wcrtomb.c index 9f869e8..71ded9c 100644 --- a/mingw-w64-crt/misc/wcrtomb.c +++ b/mingw-w64-crt/misc/wcrtomb.c
@@ -6,7 +6,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include "mb_wc_common.h" +#include <locale.h> #include <wchar.h> #include <stdlib.h> #include <errno.h>
diff --git a/mingw-w64-crt/misc/wcstof.c b/mingw-w64-crt/misc/wcstof.c index 7673338..0e73c5c 100644 --- a/mingw-w64-crt/misc/wcstof.c +++ b/mingw-w64-crt/misc/wcstof.c
@@ -15,8 +15,6 @@ #include <string.h> #include <mbstring.h> -#include "mb_wc_common.h" - float wcstof (const wchar_t * __restrict__ wcs, wchar_t ** __restrict__ wcse) { char * cs;
diff --git a/mingw-w64-crt/misc/wctob.c b/mingw-w64-crt/misc/wctob.c index 2fe6661..57f6170 100644 --- a/mingw-w64-crt/misc/wctob.c +++ b/mingw-w64-crt/misc/wctob.c
@@ -6,7 +6,7 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include "mb_wc_common.h" +#include <locale.h> #include <limits.h> #include <wchar.h> #include <stdio.h>