Remove redundant MBCS/wide character converter aliases.

diff --git a/VERSION.m4 b/VERSION.m4
index bb83e8d..14f1656 100644 (file)
--- a/VERSION.m4
+++ b/VERSION.m4
@@ -1,6 +1,6 @@
 # VERSION.m4 -- vim: filetype=config
 #
-# $Id$
+# $Id: VERSION.m4,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
 #
 # Non-copyrightable material; adjust the following definition, to
 # assign a common version number to each of the mingwrt and w32api
@@ -23,7 +23,7 @@ m4_define([__VERSION__],[5.4])
 #    as required, in accordance with libtool conventions.
 #
 m4_define([MINGW_AC_ENUMERATE_DLLVERSION_SPECS],dnl
-[MINGW_AC_SET_DLLVERSION([LIBMINGWEX], [libmingwex.dll.a], [3:0:1])dnl
+[MINGW_AC_SET_DLLVERSION([LIBMINGWEX], [libmingwex.dll.a], [4:0:0])dnl
 ])
 
-# $RCSfile$: end of file
+# $RCSfile: VERSION.m4,v $: end of file

diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
index f1291fc..497f856 100644 (file)
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,3 +1,18 @@
+2020-07-07  Keith Marshall  <keith@users.osdn.me>
+
+       Remove redundant MBCS/wide character converter aliases.
+
+       * mingwex/btowc.c (__mingw_btowc, __msvcrt_btowc):
+       * mingwex/mbrlen.c (__mingw_mbrlen, __msvcrt_mbrlen):
+       * mingwex/mbrtowc.c (__mingw_mbrtowc, __msvcrt_mbrtowc):
+       * mingwex/mbsrtowcs.c (__mingw_mbsrtowcs, __msvcrt_mbsrtowcs):
+       * mingwex/wcsrtombs.c (__mingw_wcsrtombs, __msvcrt_wcsrtombs):
+       * mingwex/wcrtomb.c (__mingw_wcrtomb, __msvcrt_wcrtomb):
+       * mingwex/wctob.c (__mingw_wctob, __msvcrt_wctob): Delete aliases.
+
+       * VERSION.m4 (MINGW_AC_SET_DLLVERSION) [LIBMINGWEX]: Increment it
+       to 4:0:0; alias removal breaks ABI backward compatibility.
+
 2020-07-06  Keith Marshall  <keith@users.osdn.me>
 
        Prepare and publish MinGW.org WSL-5.3.4 release.

diff --git a/mingwrt/mingwex/btowc.c b/mingwrt/mingwex/btowc.c
index c1d58f7..b9e1da9 100644 (file)
--- a/mingwrt/mingwex/btowc.c
+++ b/mingwrt/mingwex/btowc.c
@@ -8,7 +8,7 @@
  * as mbrtowc(), which may need to return surrogate pairs.
  *
  *
- * $Id$
+ * $Id: btowc.c,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
  *
  * Written by Keith Marshall <keith@users.osdn.me>
  * Copyright (C) 2020, MinGW.org Project
@@ -55,11 +55,4 @@ wint_t btowc( int c )
   return WEOF;
 }
 
-/* FIXME: these aliases are provided for link-compatibitity with
- * libraries compiled against mingwrt-5.3.x; they may be removed
- * from future versions of mingwrt.
- */
-wint_t __msvcrt_btowc( int c )__attribute__((__weak__,__alias__("btowc")));
-wint_t __mingw_btowc( int c )__attribute__((__weak__,__alias__("btowc")));
-
-/* $RCSfile$: end of file */
+/* $RCSfile: btowc.c,v $: end of file */

diff --git a/mingwrt/mingwex/mbrlen.c b/mingwrt/mingwex/mbrlen.c
index 42c8f76..cdd3d1a 100644 (file)
--- a/mingwrt/mingwex/mbrlen.c
+++ b/mingwrt/mingwex/mbrlen.c
@@ -7,7 +7,7 @@
  * for which it is provided.
  *
  *
- * $Id$
+ * $Id: mbrlen.c,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
  *
  * Written by Keith Marshall <keith@users.osdn.me>
  * Copyright (C) 2020, MinGW.org Project
@@ -44,14 +44,4 @@ size_t mbrlen( const char *restrict s, size_t n, mbstate_t *restrict ps )
   return __mingw_mbrtowc_handler( NULL, s, n, __mbrtowc_state( ps ) );
 }
 
-/* FIXME: these aliases are provided for link-compatibitity with
- * libraries compiled against mingwrt-5.3.x; they may be removed
- * from future versions of mingwrt.
- */
-size_t __mingw_mbrlen( const char *restrict, size_t, mbstate_t *restrict )
-__attribute__((__weak__,__alias__("mbrlen")));
-
-size_t __msvcrt_mbrlen( const char *restrict, size_t, mbstate_t *restrict )
-__attribute__((__weak__,__alias__("mbrlen")));
-
-/* $RCSfile$: end of file */
+/* $RCSfile: mbrlen.c,v $: end of file */

diff --git a/mingwrt/mingwex/mbrtowc.c b/mingwrt/mingwex/mbrtowc.c
index d284013..43d6895 100644 (file)
--- a/mingwrt/mingwex/mbrtowc.c
+++ b/mingwrt/mingwex/mbrtowc.c
@@ -7,7 +7,7 @@
  * those Windows versions for which it is provided.
  *
  *
- * $Id$
+ * $Id: mbrtowc.c,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
  *
  * Written by Keith Marshall <keith@users.osdn.me>
  * Copyright (C) 2020, MinGW.org Project
@@ -57,16 +57,4 @@ size_t mbrtowc
   return __mingw_mbrtowc_handler( pwc, s, n, __mbrtowc_state( ps ) );
 }
 
-/* FIXME: these aliases are provided for link-compatibitity with
- * libraries compiled against mingwrt-5.3.x; they may be removed
- * from future versions of mingwrt.
- */
-size_t __mingw_mbrtowc
-( wchar_t *restrict, const char *restrict, size_t, mbstate_t *restrict )
-__attribute__((__weak__,__alias__("mbrtowc")));
-
-size_t __msvcrt_mbrtowc
-( wchar_t *restrict, const char *restrict, size_t, mbstate_t *restrict )
-__attribute__((__weak__,__alias__("mbrtowc")));
-
-/* $RCSfile$: end of file */
+/* $RCSfile: mbrtowc.c,v $: end of file */

diff --git a/mingwrt/mingwex/mbsrtowcs.c b/mingwrt/mingwex/mbsrtowcs.c
index 7d8a150..2cd6db1 100644 (file)
--- a/mingwrt/mingwex/mbsrtowcs.c
+++ b/mingwrt/mingwex/mbsrtowcs.c
@@ -7,7 +7,7 @@
  * for which it is provided.
  *
  *
- * $Id$
+ * $Id: mbsrtowcs.c,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
  *
  * Written by Keith Marshall <keith@users.osdn.me>
  * Copyright (C) 2020, MinGW.org Project
@@ -167,16 +167,4 @@ size_t mbsrtowcs
   return __mbsrtowcs_internal( wcs, src, len, __mbrtowc_state( ps ) );
 }
 
-/* FIXME: these aliases are provided for link-compatibitity with
- * libraries compiled against mingwrt-5.3.x; they may be removed
- * from future versions of mingwrt.
- */
-size_t __mingw_mbsrtowcs
-( wchar_t *restrict, const char **restrict, size_t, mbstate_t *restrict )
-__attribute__((__weak__,__alias__("mbsrtowcs")));
-
-size_t __msvcrt_mbsrtowcs
-( wchar_t *restrict, const char **restrict, size_t, mbstate_t *restrict )
-__attribute__((__weak__,__alias__("mbsrtowcs")));
-
-/* $RCSfile$: end of file */
+/* $RCSfile: mbsrtowcs.c,v $: end of file */

diff --git a/mingwrt/mingwex/wcrtomb.c b/mingwrt/mingwex/wcrtomb.c
index 96896e0..3b11ec3 100644 (file)
--- a/mingwrt/mingwex/wcrtomb.c
+++ b/mingwrt/mingwex/wcrtomb.c
@@ -7,7 +7,7 @@
  * where one is available.
  *
  *
- * $Id$
+ * $Id: wcrtomb.c,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
  *
  * Written by Keith Marshall <keith@users.osdn.me>
  * Copyright (C) 2019, 2020, MinGW.org Project
@@ -118,14 +118,4 @@ size_t wcrtomb( char *restrict mb, wchar_t wc, mbstate_t *restrict ps )
   return __wcrtomb_internal( mb, wc, __mbrtowc_state( ps ) );
 }
 
-/* FIXME: these aliases are provided for link-compatibitity with
- * libraries compiled against mingwrt-5.3.x; they may be removed
- * from future versions of mingwrt.
- */
-size_t __msvcrt_wcrtomb( char *restrict, wchar_t, mbstate_t *restrict )
-__attribute__((__weak__,__alias__("wcrtomb")));
-
-size_t __mingw_wcrtomb( char *restrict, wchar_t, mbstate_t *restrict )
-__attribute__((__weak__,__alias__("wcrtomb")));
-
-/* $RCSfile$: end of file */
+/* $RCSfile: wcrtomb.c,v $: end of file */

diff --git a/mingwrt/mingwex/wcsrtombs.c b/mingwrt/mingwex/wcsrtombs.c
index e6a7f69..7d7cb6c 100644 (file)
--- a/mingwrt/mingwex/wcsrtombs.c
+++ b/mingwrt/mingwex/wcsrtombs.c
@@ -6,7 +6,7 @@
  * provide it, and replaces the Microsoft implementation, when they do.
  *
  *
- * $Id$
+ * $Id: wcsrtombs.c,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
  *
  * Written by Keith Marshall <keith@users.osdn.me>
  * Copyright (C) 2019, 2020, MinGW.org Project
@@ -154,14 +154,4 @@ size_t wcsrtombs( char *mbs, const wchar_t **wcs, size_t len, mbstate_t *ps )
   return __mingw_wcsrtombs_internal( mbs, wcs, len, ps );
 }
 
-/* FIXME: these aliases are provided for link-compatibitity with
- * libraries compiled against mingwrt-5.3.x; they may be removed
- * from future versions of mingwrt.
- */
-size_t __msvcrt_wcsrtombs( char *, const wchar_t **, size_t, mbstate_t * )
-__attribute__((__weak__,__alias__("wcsrtombs")));
-
-size_t __mingw_wcsrtombs( char *, const wchar_t **, size_t, mbstate_t * )
-__attribute__((__weak__,__alias__("wcsrtombs")));
-
-/* $RCSfile$: end of file */
+/* $RCSfile: wcsrtombs.c,v $: end of file */

diff --git a/mingwrt/mingwex/wctob.c b/mingwrt/mingwex/wctob.c
index ca94eb3..adb62d9 100644 (file)
--- a/mingwrt/mingwex/wctob.c
+++ b/mingwrt/mingwex/wctob.c
@@ -7,7 +7,7 @@
  * MSVCRT.DLL, or MSVCRn.DLL which does.
  *
  *
- * $Id$
+ * $Id: wctob.c,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
  *
  * Written by Keith Marshall <keith@users.osdn.me>
  * Copyright (C) 2020, MinGW.org Project
@@ -51,11 +51,4 @@ int wctob( wint_t wc )
     ? (int)(retval.u) : EOF;
 }
 
-/* FIXME: these aliases are provided for link-compatibitity with
- * libraries compiled against mingwrt-5.3.x; they may be removed
- * from future versions of mingwrt.
- */
-int __msvcrt_wctob( wint_t )__attribute__((__weak__,__alias__("wctob")));
-int __mingw_wctob( wint_t )__attribute__((__weak__,__alias__("wctob")));
-
-/* $RCSfile$: end of file */
+/* $RCSfile: wctob.c,v $: end of file */