CRT header file locale.h is the correct one which provides declaration of
___lc_codepage_func function.
---
mingw-w64-crt/Makefile.am | 1 -
mingw-w64-crt/misc/btowc.c | 2 +-
mingw-w64-crt/misc/mb_wc_common.h | 9 ---------
mingw-w64-crt/misc/mbrtowc.c | 2 +-
mingw-w64-crt/misc/mingw_wcstold.c | 2 --
mingw-w64-crt/misc/wcrtomb.c | 2 +-
mingw-w64-crt/misc/wcstof.c | 2 --
mingw-w64-crt/misc/wctob.c | 2 +-
8 files changed, 4 insertions(+), 18 deletions(-)
delete mode 100644 mingw-w64-crt/misc/mb_wc_common.h
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 498b6731b8a7..d2347ccf1989 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -1114,7 +1114,6 @@ src_libmingwex=\
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 caf2d95ba181..2029edc2c7f5 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 c640fb776754..000000000000
--- 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 f53286e91440..200711c8004e 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 2f66bee2b639..407e1696cab5 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 9f869e8f642e..71ded9cbca59 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 7673338a85d9..0e73c5c192c4 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 2fe66618d6bd..57f6170bbfd2 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>
--
2.20.1
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
