diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2022-07-05 23:57:32 -0500 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2022-07-06 00:00:18 -0500 |
| commit | 27436451ecbf250db4d1704c586763cb40e6dfeb (patch) | |
| tree | a0713c338993726cc8bf4a8d1cef7d0336fa5065 /lib/string.in.h | |
| parent | 2be06b13dd9582d7216c479e9874f0df6d32746b (diff) | |
| download | emacs-27436451ecbf250db4d1704c586763cb40e6dfeb.tar.gz | |
Update from Gnulib by running admin/merge-gnulib
* admin/merge-gnulib (AVOIDED_MODULES): Add chmod.
Diffstat (limited to 'lib/string.in.h')
| -rw-r--r-- | lib/string.in.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/string.in.h b/lib/string.in.h index 33160b25254..3996da9fcb5 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -122,8 +122,12 @@ _GL_EXTERN_C void rpl_free (void *); # undef _GL_ATTRIBUTE_DEALLOC_FREE # define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (rpl_free, 1) # else -# if defined _MSC_VER -_GL_EXTERN_C void __cdecl free (void *); +# if defined _MSC_VER && !defined free +_GL_EXTERN_C +# if defined _DLL + __declspec (dllimport) +# endif + void __cdecl free (void *); # else # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) _GL_EXTERN_C void free (void *) throw (); @@ -133,8 +137,12 @@ _GL_EXTERN_C void free (void *); # endif # endif #else -# if defined _MSC_VER -_GL_EXTERN_C void __cdecl free (void *); +# if defined _MSC_VER && !defined free +_GL_EXTERN_C +# if defined _DLL + __declspec (dllimport) +# endif + void __cdecl free (void *); # else # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) _GL_EXTERN_C void free (void *) throw (); |