mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
Use Gnulib's `nproc'.
This updates Gnulib to v0.0-4496-g6491120. * m4/gnulib-cache.m4: Add `nproc'.
This commit is contained in:
parent
cb26e97a88
commit
0f00f2c33a
90 changed files with 2524 additions and 680 deletions
|
@ -21,6 +21,7 @@
|
|||
#if __GNUC__ >= 3
|
||||
@PRAGMA_SYSTEM_HEADER@
|
||||
#endif
|
||||
@PRAGMA_COLUMNS@
|
||||
|
||||
/* The include_next requires a split double-inclusion guard. */
|
||||
#@INCLUDE_NEXT@ @NEXT_STRING_H@
|
||||
|
@ -49,6 +50,12 @@
|
|||
# define _GL_ATTRIBUTE_PURE /* empty */
|
||||
#endif
|
||||
|
||||
/* NetBSD 5.0 declares strsignal in <unistd.h>, not in <string.h>. */
|
||||
/* But in any case avoid namespace pollution on glibc systems. */
|
||||
#if (@GNULIB_STRSIGNAL@ || defined GNULIB_POSIXCHECK) && defined __NetBSD__ \
|
||||
&& ! defined __GLIBC__
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
|
||||
|
||||
|
@ -80,7 +87,7 @@ _GL_CXXALIAS_SYS_CAST2 (memchr,
|
|||
void *, (void const *__s, int __c, size_t __n),
|
||||
void const *, (void const *__s, int __c, size_t __n));
|
||||
# endif
|
||||
# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
|
||||
# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
|
||||
_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n));
|
||||
_GL_CXXALIASWARN1 (memchr, void const *,
|
||||
|
@ -165,7 +172,7 @@ _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t)
|
|||
_GL_CXXALIAS_SYS_CAST2 (memrchr,
|
||||
void *, (void const *, int, size_t),
|
||||
void const *, (void const *, int, size_t));
|
||||
# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
|
||||
# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
|
||||
_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t));
|
||||
_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t));
|
||||
|
@ -195,7 +202,7 @@ _GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in)
|
|||
_GL_CXXALIAS_SYS_CAST2 (rawmemchr,
|
||||
void *, (void const *__s, int __c_in),
|
||||
void const *, (void const *__s, int __c_in));
|
||||
# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
|
||||
# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
|
||||
_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in));
|
||||
_GL_CXXALIASWARN1 (rawmemchr, void const *, (void const *__s, int __c_in));
|
||||
|
@ -286,7 +293,7 @@ _GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in)
|
|||
_GL_CXXALIAS_SYS_CAST2 (strchrnul,
|
||||
char *, (char const *__s, int __c_in),
|
||||
char const *, (char const *__s, int __c_in));
|
||||
# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
|
||||
# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
|
||||
_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in));
|
||||
_GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in));
|
||||
|
@ -432,7 +439,7 @@ _GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept)
|
|||
_GL_CXXALIAS_SYS_CAST2 (strpbrk,
|
||||
char *, (char const *__s, char const *__accept),
|
||||
const char *, (char const *__s, char const *__accept));
|
||||
# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
|
||||
# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
|
||||
_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept));
|
||||
_GL_CXXALIASWARN1 (strpbrk, char const *,
|
||||
|
@ -534,7 +541,7 @@ _GL_CXXALIAS_SYS_CAST2 (strstr,
|
|||
char *, (const char *haystack, const char *needle),
|
||||
const char *, (const char *haystack, const char *needle));
|
||||
# endif
|
||||
# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
|
||||
# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
|
||||
_GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle));
|
||||
_GL_CXXALIASWARN1 (strstr, const char *,
|
||||
|
@ -583,7 +590,7 @@ _GL_CXXALIAS_SYS_CAST2 (strcasestr,
|
|||
char *, (const char *haystack, const char *needle),
|
||||
const char *, (const char *haystack, const char *needle));
|
||||
# endif
|
||||
# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
|
||||
# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
|
||||
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
|
||||
_GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle));
|
||||
_GL_CXXALIASWARN1 (strcasestr, const char *,
|
||||
|
@ -895,6 +902,35 @@ _GL_WARN_ON_USE (strerror, "strerror is unportable - "
|
|||
"use gnulib module strerror to guarantee non-NULL result");
|
||||
#endif
|
||||
|
||||
/* Map any int, typically from errno, into an error message. Multithread-safe.
|
||||
Uses the POSIX declaration, not the glibc declaration. */
|
||||
#if @GNULIB_STRERROR_R@
|
||||
# if @REPLACE_STRERROR_R@
|
||||
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||
# undef strerror_r
|
||||
# define strerror_r rpl_strerror_r
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen)
|
||||
_GL_ARG_NONNULL ((2)));
|
||||
_GL_CXXALIAS_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen));
|
||||
# else
|
||||
# if !@HAVE_DECL_STRERROR_R@
|
||||
_GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen)
|
||||
_GL_ARG_NONNULL ((2)));
|
||||
# endif
|
||||
_GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen));
|
||||
# endif
|
||||
# if @HAVE_DECL_STRERROR_R@
|
||||
_GL_CXXALIASWARN (strerror_r);
|
||||
# endif
|
||||
#elif defined GNULIB_POSIXCHECK
|
||||
# undef strerror_r
|
||||
# if HAVE_RAW_DECL_STRERROR_R
|
||||
_GL_WARN_ON_USE (strerror_r, "strerror_r is unportable - "
|
||||
"use gnulib module strerror_r-posix for portability");
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if @GNULIB_STRSIGNAL@
|
||||
# if @REPLACE_STRSIGNAL@
|
||||
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue