diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-09-08 09:42:41 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-09-08 09:46:43 -0700 |
| commit | 48cfbe8a9e11681a36b53a1304b3ab554de4b350 (patch) | |
| tree | 732c275cc7e8d0d71b0dae549548a1f5caab04ed | |
| parent | a4a2d039a9117266ed8cb1977241e7c34b368993 (diff) | |
| download | gnulib-48cfbe8a9e11681a36b53a1304b3ab554de4b350.tar.gz | |
string, wchar: port rpl_free decl to Android
* lib/string.in.h, lib/wchar.in.h:
(free): When replacing it, declare the unreplaced version too.
Problem reported by Lucy Phipps in:
https://lists.gnu.org/r/bug-gnulib/2021-09/msg00026.html
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/string.in.h | 1 | ||||
| -rw-r--r-- | lib/wchar.in.h | 1 |
3 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,11 @@ +2021-09-08 Paul Eggert <eggert@cs.ucla.edu> + + string, wchar: port rpl_free decl to Android + * lib/string.in.h, lib/wchar.in.h: + (free): When replacing it, declare the unreplaced version too. + Problem reported by Lucy Phipps in: + https://lists.gnu.org/r/bug-gnulib/2021-09/msg00026.html + 2021-09-07 Paul Eggert <eggert@cs.ucla.edu> string, wchar: avoid some namespace pollution diff --git a/lib/string.in.h b/lib/string.in.h index 6214b55784..8977153c88 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -86,6 +86,7 @@ /* Declare 'free' if needed for _GL_ATTRIBUTE_DEALLOC_FREE. */ #if (@REPLACE_FREE@ && !defined free \ && !(defined __cplusplus && defined GNULIB_NAMESPACE)) +_GL_EXTERN_C void free (void *); # define free rpl_free #endif _GL_EXTERN_C void free (void *); diff --git a/lib/wchar.in.h b/lib/wchar.in.h index 027a145496..acb9d4ea64 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -149,6 +149,7 @@ typedef int rpl_mbstate_t; /* Declare 'free' if needed for _GL_ATTRIBUTE_DEALLOC_FREE. */ #if (@REPLACE_FREE@ && !defined free \ && !(defined __cplusplus && defined GNULIB_NAMESPACE)) +_GL_EXTERN_C void free (void *); # define free rpl_free #endif _GL_EXTERN_C void free (void *); |