diff options
| author | Paul Eggert | 2022-05-05 15:36:33 -0700 |
|---|---|---|
| committer | Paul Eggert | 2022-05-05 15:37:40 -0700 |
| commit | 9007e10a0fc94190404c6a988f7d52d162901940 (patch) | |
| tree | bec4b170622a185f9feacde07e864f32c7ca71b2 /lib/stdlib.in.h | |
| parent | 7e9d364b663613fd907f92de31e996463ef7d03c (diff) | |
| download | emacs-9007e10a0fc94190404c6a988f7d52d162901940.tar.gz emacs-9007e10a0fc94190404c6a988f7d52d162901940.zip | |
Gnulib update via admin/merge-gnulib
Diffstat (limited to 'lib/stdlib.in.h')
| -rw-r--r-- | lib/stdlib.in.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index d52c2f79638..a86643c3ca3 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h | |||
| @@ -184,7 +184,11 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " | |||
| 184 | # undef free | 184 | # undef free |
| 185 | # define free rpl_free | 185 | # define free rpl_free |
| 186 | # endif | 186 | # endif |
| 187 | # if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) | ||
| 188 | _GL_FUNCDECL_RPL (free, void, (void *ptr) throw ()); | ||
| 189 | # else | ||
| 187 | _GL_FUNCDECL_RPL (free, void, (void *ptr)); | 190 | _GL_FUNCDECL_RPL (free, void, (void *ptr)); |
| 191 | # endif | ||
| 188 | _GL_CXXALIAS_RPL (free, void, (void *ptr)); | 192 | _GL_CXXALIAS_RPL (free, void, (void *ptr)); |
| 189 | # else | 193 | # else |
| 190 | _GL_CXXALIAS_SYS (free, void, (void *ptr)); | 194 | _GL_CXXALIAS_SYS (free, void, (void *ptr)); |