mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -08:00
Update from Gnulib by running admin/merge-gnulib
This commit is contained in:
parent
30335bb734
commit
71ee484cac
37 changed files with 723 additions and 343 deletions
|
|
@ -63,7 +63,7 @@
|
|||
#include <stddef.h>
|
||||
|
||||
/* MirBSD 10 defines WEXITSTATUS in <sys/wait.h>, not in <stdlib.h>.
|
||||
glibc 2.40 defines WCOREDUMP in <sys/wait.h>, not in <stdlib.h>. */
|
||||
glibc 2.41 defines WCOREDUMP in <sys/wait.h>, not in <stdlib.h>. */
|
||||
#if @GNULIB_SYSTEM_POSIX@ && !(defined WEXITSTATUS && defined WCOREDUMP)
|
||||
# include <sys/wait.h>
|
||||
#endif
|
||||
|
|
@ -120,14 +120,14 @@ struct random_data
|
|||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
#if ((@GNULIB_STRTOL@ && @REPLACE_STRTOL@) || (@GNULIB_STRTOLL@ && @REPLACE_STRTOLL@) || (@GNULIB_STRTOUL@ && @REPLACE_STRTOUL@) || (@GNULIB_STRTOULL@ && @REPLACE_STRTOULL@)) && defined __cplusplus && !defined GNULIB_NAMESPACE && defined __GNUG__ && !defined __clang__ && defined __sun
|
||||
#if ((@GNULIB_STRTOL@ && @REPLACE_STRTOL@) || (@GNULIB_STRTOLL@ && @REPLACE_STRTOLL@) || (@GNULIB_STRTOUL@ && @REPLACE_STRTOUL@) || (@GNULIB_STRTOULL@ && @REPLACE_STRTOULL@)) && defined __cplusplus && !defined GNULIB_NAMESPACE && defined __GNUG__ && !defined __clang__ && (defined __sun || defined _AIX)
|
||||
/* When strtol, strtoll, strtoul, or strtoull is going to be defined as a macro
|
||||
below, this may cause compilation errors later in the libstdc++ header files
|
||||
(that are part of GCC), such as:
|
||||
error: 'rpl_strtol' is not a member of 'std'
|
||||
To avoid this, include the relevant header files here, before these symbols
|
||||
get defined as macros. But do so only on Solaris 11 (where it is needed),
|
||||
not on mingw (where it would cause other compilation errors). */
|
||||
get defined as macros. But do so only on Solaris 11 and AIX (where it is
|
||||
needed), not on mingw (where it would cause other compilation errors). */
|
||||
# include <string>
|
||||
#endif
|
||||
|
||||
|
|
@ -1473,11 +1473,17 @@ _GL_WARN_ON_USE (setstate_r, "setstate_r is unportable - "
|
|||
# if @REPLACE_REALLOC_FOR_REALLOC_POSIX@
|
||||
# if @REPLACE_REALLOC_FOR_REALLOC_POSIX@ == 2
|
||||
# define _GL_INLINE_RPL_REALLOC 1
|
||||
# ifdef __cplusplus
|
||||
extern "C" {
|
||||
# endif
|
||||
_GL_REALLOC_INLINE void *
|
||||
rpl_realloc (void *ptr, size_t size)
|
||||
{
|
||||
return realloc (ptr, size ? size : 1);
|
||||
}
|
||||
# ifdef __cplusplus
|
||||
}
|
||||
# endif
|
||||
# endif
|
||||
# if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
|
||||
|| _GL_USE_STDLIB_ALLOC)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue