• R/O
  • HTTP
  • SSH
  • HTTPS

mingw-org-wsl: Commit

The MinGW.org Windows System Libraries


Commit MetaInfo

Revision7155c181ec6655e342ab604fe1beabb946440bcf (tree)
Time2020-07-08 06:02:51
AuthorKeith Marshall <keith@user...>
CommiterKeith Marshall

Log Message

Remove redundant MBCS/wide character converter aliases.

Change Summary

Incremental Difference

--- a/VERSION.m4
+++ b/VERSION.m4
@@ -1,6 +1,6 @@
11 # VERSION.m4 -- vim: filetype=config
22 #
3-# $Id$
3+# $Id: VERSION.m4,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
44 #
55 # Non-copyrightable material; adjust the following definition, to
66 # assign a common version number to each of the mingwrt and w32api
@@ -23,7 +23,7 @@ m4_define([__VERSION__],[5.4])
2323 # as required, in accordance with libtool conventions.
2424 #
2525 m4_define([MINGW_AC_ENUMERATE_DLLVERSION_SPECS],dnl
26-[MINGW_AC_SET_DLLVERSION([LIBMINGWEX], [libmingwex.dll.a], [3:0:1])dnl
26+[MINGW_AC_SET_DLLVERSION([LIBMINGWEX], [libmingwex.dll.a], [4:0:0])dnl
2727 ])
2828
29-# $RCSfile$: end of file
29+# $RCSfile: VERSION.m4,v $: end of file
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,3 +1,18 @@
1+2020-07-07 Keith Marshall <keith@users.osdn.me>
2+
3+ Remove redundant MBCS/wide character converter aliases.
4+
5+ * mingwex/btowc.c (__mingw_btowc, __msvcrt_btowc):
6+ * mingwex/mbrlen.c (__mingw_mbrlen, __msvcrt_mbrlen):
7+ * mingwex/mbrtowc.c (__mingw_mbrtowc, __msvcrt_mbrtowc):
8+ * mingwex/mbsrtowcs.c (__mingw_mbsrtowcs, __msvcrt_mbsrtowcs):
9+ * mingwex/wcsrtombs.c (__mingw_wcsrtombs, __msvcrt_wcsrtombs):
10+ * mingwex/wcrtomb.c (__mingw_wcrtomb, __msvcrt_wcrtomb):
11+ * mingwex/wctob.c (__mingw_wctob, __msvcrt_wctob): Delete aliases.
12+
13+ * VERSION.m4 (MINGW_AC_SET_DLLVERSION) [LIBMINGWEX]: Increment it
14+ to 4:0:0; alias removal breaks ABI backward compatibility.
15+
116 2020-07-06 Keith Marshall <keith@users.osdn.me>
217
318 Prepare and publish MinGW.org WSL-5.3.4 release.
--- a/mingwrt/mingwex/btowc.c
+++ b/mingwrt/mingwex/btowc.c
@@ -8,7 +8,7 @@
88 * as mbrtowc(), which may need to return surrogate pairs.
99 *
1010 *
11- * $Id$
11+ * $Id: btowc.c,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
1212 *
1313 * Written by Keith Marshall <keith@users.osdn.me>
1414 * Copyright (C) 2020, MinGW.org Project
@@ -55,11 +55,4 @@ wint_t btowc( int c )
5555 return WEOF;
5656 }
5757
58-/* FIXME: these aliases are provided for link-compatibitity with
59- * libraries compiled against mingwrt-5.3.x; they may be removed
60- * from future versions of mingwrt.
61- */
62-wint_t __msvcrt_btowc( int c )__attribute__((__weak__,__alias__("btowc")));
63-wint_t __mingw_btowc( int c )__attribute__((__weak__,__alias__("btowc")));
64-
65-/* $RCSfile$: end of file */
58+/* $RCSfile: btowc.c,v $: end of file */
--- a/mingwrt/mingwex/mbrlen.c
+++ b/mingwrt/mingwex/mbrlen.c
@@ -7,7 +7,7 @@
77 * for which it is provided.
88 *
99 *
10- * $Id$
10+ * $Id: mbrlen.c,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
1111 *
1212 * Written by Keith Marshall <keith@users.osdn.me>
1313 * Copyright (C) 2020, MinGW.org Project
@@ -44,14 +44,4 @@ size_t mbrlen( const char *restrict s, size_t n, mbstate_t *restrict ps )
4444 return __mingw_mbrtowc_handler( NULL, s, n, __mbrtowc_state( ps ) );
4545 }
4646
47-/* FIXME: these aliases are provided for link-compatibitity with
48- * libraries compiled against mingwrt-5.3.x; they may be removed
49- * from future versions of mingwrt.
50- */
51-size_t __mingw_mbrlen( const char *restrict, size_t, mbstate_t *restrict )
52-__attribute__((__weak__,__alias__("mbrlen")));
53-
54-size_t __msvcrt_mbrlen( const char *restrict, size_t, mbstate_t *restrict )
55-__attribute__((__weak__,__alias__("mbrlen")));
56-
57-/* $RCSfile$: end of file */
47+/* $RCSfile: mbrlen.c,v $: end of file */
--- a/mingwrt/mingwex/mbrtowc.c
+++ b/mingwrt/mingwex/mbrtowc.c
@@ -7,7 +7,7 @@
77 * those Windows versions for which it is provided.
88 *
99 *
10- * $Id$
10+ * $Id: mbrtowc.c,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
1111 *
1212 * Written by Keith Marshall <keith@users.osdn.me>
1313 * Copyright (C) 2020, MinGW.org Project
@@ -57,16 +57,4 @@ size_t mbrtowc
5757 return __mingw_mbrtowc_handler( pwc, s, n, __mbrtowc_state( ps ) );
5858 }
5959
60-/* FIXME: these aliases are provided for link-compatibitity with
61- * libraries compiled against mingwrt-5.3.x; they may be removed
62- * from future versions of mingwrt.
63- */
64-size_t __mingw_mbrtowc
65-( wchar_t *restrict, const char *restrict, size_t, mbstate_t *restrict )
66-__attribute__((__weak__,__alias__("mbrtowc")));
67-
68-size_t __msvcrt_mbrtowc
69-( wchar_t *restrict, const char *restrict, size_t, mbstate_t *restrict )
70-__attribute__((__weak__,__alias__("mbrtowc")));
71-
72-/* $RCSfile$: end of file */
60+/* $RCSfile: mbrtowc.c,v $: end of file */
--- a/mingwrt/mingwex/mbsrtowcs.c
+++ b/mingwrt/mingwex/mbsrtowcs.c
@@ -7,7 +7,7 @@
77 * for which it is provided.
88 *
99 *
10- * $Id$
10+ * $Id: mbsrtowcs.c,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
1111 *
1212 * Written by Keith Marshall <keith@users.osdn.me>
1313 * Copyright (C) 2020, MinGW.org Project
@@ -167,16 +167,4 @@ size_t mbsrtowcs
167167 return __mbsrtowcs_internal( wcs, src, len, __mbrtowc_state( ps ) );
168168 }
169169
170-/* FIXME: these aliases are provided for link-compatibitity with
171- * libraries compiled against mingwrt-5.3.x; they may be removed
172- * from future versions of mingwrt.
173- */
174-size_t __mingw_mbsrtowcs
175-( wchar_t *restrict, const char **restrict, size_t, mbstate_t *restrict )
176-__attribute__((__weak__,__alias__("mbsrtowcs")));
177-
178-size_t __msvcrt_mbsrtowcs
179-( wchar_t *restrict, const char **restrict, size_t, mbstate_t *restrict )
180-__attribute__((__weak__,__alias__("mbsrtowcs")));
181-
182-/* $RCSfile$: end of file */
170+/* $RCSfile: mbsrtowcs.c,v $: end of file */
--- a/mingwrt/mingwex/wcrtomb.c
+++ b/mingwrt/mingwex/wcrtomb.c
@@ -7,7 +7,7 @@
77 * where one is available.
88 *
99 *
10- * $Id$
10+ * $Id: wcrtomb.c,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
1111 *
1212 * Written by Keith Marshall <keith@users.osdn.me>
1313 * Copyright (C) 2019, 2020, MinGW.org Project
@@ -118,14 +118,4 @@ size_t wcrtomb( char *restrict mb, wchar_t wc, mbstate_t *restrict ps )
118118 return __wcrtomb_internal( mb, wc, __mbrtowc_state( ps ) );
119119 }
120120
121-/* FIXME: these aliases are provided for link-compatibitity with
122- * libraries compiled against mingwrt-5.3.x; they may be removed
123- * from future versions of mingwrt.
124- */
125-size_t __msvcrt_wcrtomb( char *restrict, wchar_t, mbstate_t *restrict )
126-__attribute__((__weak__,__alias__("wcrtomb")));
127-
128-size_t __mingw_wcrtomb( char *restrict, wchar_t, mbstate_t *restrict )
129-__attribute__((__weak__,__alias__("wcrtomb")));
130-
131-/* $RCSfile$: end of file */
121+/* $RCSfile: wcrtomb.c,v $: end of file */
--- a/mingwrt/mingwex/wcsrtombs.c
+++ b/mingwrt/mingwex/wcsrtombs.c
@@ -6,7 +6,7 @@
66 * provide it, and replaces the Microsoft implementation, when they do.
77 *
88 *
9- * $Id$
9+ * $Id: wcsrtombs.c,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
1010 *
1111 * Written by Keith Marshall <keith@users.osdn.me>
1212 * 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 )
154154 return __mingw_wcsrtombs_internal( mbs, wcs, len, ps );
155155 }
156156
157-/* FIXME: these aliases are provided for link-compatibitity with
158- * libraries compiled against mingwrt-5.3.x; they may be removed
159- * from future versions of mingwrt.
160- */
161-size_t __msvcrt_wcsrtombs( char *, const wchar_t **, size_t, mbstate_t * )
162-__attribute__((__weak__,__alias__("wcsrtombs")));
163-
164-size_t __mingw_wcsrtombs( char *, const wchar_t **, size_t, mbstate_t * )
165-__attribute__((__weak__,__alias__("wcsrtombs")));
166-
167-/* $RCSfile$: end of file */
157+/* $RCSfile: wcsrtombs.c,v $: end of file */
--- a/mingwrt/mingwex/wctob.c
+++ b/mingwrt/mingwex/wctob.c
@@ -7,7 +7,7 @@
77 * MSVCRT.DLL, or MSVCRn.DLL which does.
88 *
99 *
10- * $Id$
10+ * $Id: wctob.c,v 28b17d1c4eab 2020/07/07 21:02:51 keith $
1111 *
1212 * Written by Keith Marshall <keith@users.osdn.me>
1313 * Copyright (C) 2020, MinGW.org Project
@@ -51,11 +51,4 @@ int wctob( wint_t wc )
5151 ? (int)(retval.u) : EOF;
5252 }
5353
54-/* FIXME: these aliases are provided for link-compatibitity with
55- * libraries compiled against mingwrt-5.3.x; they may be removed
56- * from future versions of mingwrt.
57- */
58-int __msvcrt_wctob( wint_t )__attribute__((__weak__,__alias__("wctob")));
59-int __mingw_wctob( wint_t )__attribute__((__weak__,__alias__("wctob")));
60-
61-/* $RCSfile$: end of file */
54+/* $RCSfile: wctob.c,v $: end of file */
Show on old repository browser