Menu
▾
▴
clisp-cvs Digest, Vol 47, Issue 9
|
From: <cli...@li...> - 2010-03-17 16:24:06
|
Send clisp-cvs mailing list submissions to cli...@li... To subscribe or unsubscribe via the World Wide Web, visit https://lists.sourceforge.net/lists/listinfo/clisp-cvs or, via email, send a message with subject or body 'help' to cli...@li... You can reach the person managing the list at cli...@li... When replying, please edit your Subject line so it is more specific than "Re: Contents of clisp-cvs digest..." CLISP CVS commits for today Today's Topics: 1. clisp/src/gllib langinfo.in.h, 1.1, 1.2 string.in.h, 1.5, 1.6 sys_time.in.h, 1.4, 1.5 unistd.in.h, 1.16, 1.17 wchar.in.h, 1.8, 1.9 wctype.in.h, 1.8, 1.9 (Sam Steingold) ---------------------------------------------------------------------- Message: 1 Date: Wed, 17 Mar 2010 16:23:57 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src/gllib langinfo.in.h, 1.1, 1.2 string.in.h, 1.5, 1.6 sys_time.in.h, 1.4, 1.5 unistd.in.h, 1.16, 1.17 wchar.in.h, 1.8, 1.9 wctype.in.h, 1.8, 1.9 To: cli...@li... Message-ID: <E1N...@sf...> Update of /cvsroot/clisp/clisp/src/gllib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5768/src/gllib Modified Files: langinfo.in.h string.in.h sys_time.in.h unistd.in.h wchar.in.h wctype.in.h Log Message: update gnulib Index: string.in.h =================================================================== RCS file: /cvsroot/clisp/clisp/src/gllib/string.in.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- string.in.h 23 Feb 2010 20:24:47 -0000 1.5 +++ string.in.h 17 Mar 2010 16:23:55 -0000 1.6 @@ -48,22 +48,38 @@ #endif +/* The definitions of _gl_GL_FUNCDECL_RPL etc. are copied here. */ + /* The definition of _gl_GL_ARG_NONNULL is copied here. */ /* The definition of _gl_GL_WARN_ON_USE is copied here. */ -#ifdef __cplusplus -extern "C" { -#endif - - /* Return the first instance of C within N bytes of S, or NULL. */ #if @GNULIB_MEMCHR@ # if @REPLACE_MEMCHR@ -# define memchr rpl_memchr -extern void *memchr (void const *__s, int __c, size_t __n) - __attribute__ ((__pure__)) _gl_GL_ARG_NONNULL ((1)); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define memchr rpl_memchr +# endif +_gl_GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n) + __attribute__ ((__pure__)) + _gl_GL_ARG_NONNULL ((1))); +_gl_GL_CXXALIAS_RPL (memchr, void *, (void const *__s, int __c, size_t __n)); +# else + /* On some systems, this function is defined as an overloaded function: + extern "C" { const void * std::memchr (const void *, int, size_t); } + extern "C++" { void * std::memchr (void *, int, size_t); } */ +_gl_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 \ + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +_gl_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n)); +_gl_GL_CXXALIASWARN1 (memchr, void const *, + (void const *__s, int __c, size_t __n)); +# else +_gl_GL_CXXALIASWARN (memchr); # endif #elif defined GNULIB_POSIXCHECK # undef memchr @@ -75,13 +91,28 @@ /* Return the first occurrence of NEEDLE in HAYSTACK. */ #if @GNULIB_MEMMEM@ # if @REPLACE_MEMMEM@ -# define memmem rpl_memmem -# endif -# if ! @HAVE_DECL_MEMMEM@ || @REPLACE_MEMMEM@ -extern void *memmem (void const *__haystack, size_t __haystack_len, - void const *__needle, size_t __needle_len) - __attribute__ ((__pure__)) _gl_GL_ARG_NONNULL ((1, 3)); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define memmem rpl_memmem +# endif +_gl_GL_FUNCDECL_RPL (memmem, void *, + (void const *__haystack, size_t __haystack_len, + void const *__needle, size_t __needle_len) + __attribute__ ((__pure__)) _gl_GL_ARG_NONNULL ((1, 3))); +_gl_GL_CXXALIAS_RPL (memmem, void *, + (void const *__haystack, size_t __haystack_len, + void const *__needle, size_t __needle_len)); +# else +# if ! @HAVE_DECL_MEMMEM@ +_gl_GL_FUNCDECL_SYS (memmem, void *, + (void const *__haystack, size_t __haystack_len, + void const *__needle, size_t __needle_len) + __attribute__ ((__pure__)) _gl_GL_ARG_NONNULL ((1, 3))); +# endif +_gl_GL_CXXALIAS_SYS (memmem, void *, + (void const *__haystack, size_t __haystack_len, + void const *__needle, size_t __needle_len)); # endif +_gl_GL_CXXALIASWARN (memmem); #elif defined GNULIB_POSIXCHECK # undef memmem # if HAVE_RAW_DECL_MEMMEM @@ -95,10 +126,15 @@ last written byte. */ #if @GNULIB_MEMPCPY@ # if ! @HAVE_MEMPCPY@ -extern void *mempcpy (void *restrict __dest, void const *restrict __src, - size_t __n) - _gl_GL_ARG_NONNULL ((1, 2)); +_gl_GL_FUNCDECL_SYS (mempcpy, void *, + (void *restrict __dest, void const *restrict __src, + size_t __n) + _gl_GL_ARG_NONNULL ((1, 2))); # endif +_gl_GL_CXXALIAS_SYS (mempcpy, void *, + (void *restrict __dest, void const *restrict __src, + size_t __n)); +_gl_GL_CXXALIASWARN (mempcpy); #elif defined GNULIB_POSIXCHECK # undef mempcpy # if HAVE_RAW_DECL_MEMPCPY @@ -110,8 +146,22 @@ /* Search backwards through a block for a byte (specified as an int). */ #if @GNULIB_MEMRCHR@ # if ! @HAVE_DECL_MEMRCHR@ -extern void *memrchr (void const *, int, size_t) - __attribute__ ((__pure__)) _gl_GL_ARG_NONNULL ((1)); +_gl_GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t) + __attribute__ ((__pure__)) + _gl_GL_ARG_NONNULL ((1))); +# endif + /* On some systems, this function is defined as an overloaded function: + extern "C++" { const void * std::memrchr (const void *, int, size_t); } + extern "C++" { void * std::memrchr (void *, int, size_t); } */ +_gl_GL_CXXALIAS_SYS_CAST2 (memrchr, + void *, (void const *, int, size_t), + void const *, (void const *, int, size_t)); +# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \ + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +_gl_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t)); +_gl_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t)); +# else +_gl_GL_CXXALIASWARN (memrchr); # endif #elif defined GNULIB_POSIXCHECK # undef memrchr @@ -126,8 +176,22 @@ occur within N bytes. */ #if @GNULIB_RAWMEMCHR@ # if ! @HAVE_RAWMEMCHR@ -extern void *rawmemchr (void const *__s, int __c_in) - __attribute__ ((__pure__)) _gl_GL_ARG_NONNULL ((1)); +_gl_GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in) + __attribute__ ((__pure__)) + _gl_GL_ARG_NONNULL ((1))); +# endif + /* On some systems, this function is defined as an overloaded function: + extern "C++" { const void * std::rawmemchr (const void *, int); } + extern "C++" { void * std::rawmemchr (void *, int); } */ +_gl_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 \ + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +_gl_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in)); +_gl_GL_CXXALIASWARN1 (rawmemchr, void const *, (void const *__s, int __c_in)); +# else +_gl_GL_CXXALIASWARN (rawmemchr); # endif #elif defined GNULIB_POSIXCHECK # undef rawmemchr @@ -140,9 +204,13 @@ /* Copy SRC to DST, returning the address of the terminating '\0' in DST. */ #if @GNULIB_STPCPY@ # if ! @HAVE_STPCPY@ -extern char *stpcpy (char *restrict __dst, char const *restrict __src) - _gl_GL_ARG_NONNULL ((1, 2)); +_gl_GL_FUNCDECL_SYS (stpcpy, char *, + (char *restrict __dst, char const *restrict __src) + _gl_GL_ARG_NONNULL ((1, 2))); # endif +_gl_GL_CXXALIAS_SYS (stpcpy, char *, + (char *restrict __dst, char const *restrict __src)); +_gl_GL_CXXALIASWARN (stpcpy); #elif defined GNULIB_POSIXCHECK # undef stpcpy # if HAVE_RAW_DECL_STPCPY @@ -155,11 +223,22 @@ last non-NUL byte written into DST. */ #if @GNULIB_STPNCPY@ # if ! @HAVE_STPNCPY@ -# define stpncpy gnu_stpncpy -extern char *stpncpy (char *restrict __dst, char const *restrict __src, - size_t __n) - _gl_GL_ARG_NONNULL ((1, 2)); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define stpncpy rpl_stpncpy +# endif +_gl_GL_FUNCDECL_RPL (stpncpy, char *, + (char *restrict __dst, char const *restrict __src, + size_t __n) + _gl_GL_ARG_NONNULL ((1, 2))); +_gl_GL_CXXALIAS_RPL (stpncpy, char *, + (char *restrict __dst, char const *restrict __src, + size_t __n)); +# else +_gl_GL_CXXALIAS_SYS (stpncpy, char *, + (char *restrict __dst, char const *restrict __src, + size_t __n)); # endif +_gl_GL_CXXALIASWARN (stpncpy); #elif defined GNULIB_POSIXCHECK # undef stpncpy # if HAVE_RAW_DECL_STPNCPY @@ -181,8 +260,22 @@ /* Find the first occurrence of C in S or the final NUL byte. */ #if @GNULIB_STRCHRNUL@ # if ! @HAVE_STRCHRNUL@ -extern char *strchrnul (char const *__s, int __c_in) - __attribute__ ((__pure__)) _gl_GL_ARG_NONNULL ((1)); +_gl_GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in) + __attribute__ ((__pure__)) + _gl_GL_ARG_NONNULL ((1))); +# endif + /* On some systems, this function is defined as an overloaded function: + extern "C++" { const char * std::strchrnul (const char *, int); } + extern "C++" { char * std::strchrnul (char *, int); } */ +_gl_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 \ + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +_gl_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in)); +_gl_GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in)); +# else +_gl_GL_CXXALIASWARN (strchrnul); # endif #elif defined GNULIB_POSIXCHECK # undef strchrnul @@ -195,12 +288,19 @@ /* Duplicate S, returning an identical malloc'd string. */ #if @GNULIB_STRDUP@ # if @REPLACE_STRDUP@ -# undef strdup -# define strdup rpl_strdup -# endif -# if !(@HAVE_DECL_STRDUP@ || defined strdup) || @REPLACE_STRDUP@ -extern char *strdup (char const *__s) _gl_GL_ARG_NONNULL ((1)); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef strdup +# define strdup rpl_strdup +# endif +_gl_GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _gl_GL_ARG_NONNULL ((1))); +_gl_GL_CXXALIAS_RPL (strdup, char *, (char const *__s)); +# else +# if !(@HAVE_DECL_STRDUP@ || defined strdup) +_gl_GL_FUNCDECL_SYS (strdup, char *, (char const *__s) _gl_GL_ARG_NONNULL ((1))); +# endif +_gl_GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); # endif +_gl_GL_CXXALIASWARN (strdup); #elif defined GNULIB_POSIXCHECK # undef strdup # if HAVE_RAW_DECL_STRDUP @@ -212,12 +312,21 @@ /* Return a newly allocated copy of at most N bytes of STRING. */ #if @GNULIB_STRNDUP@ # if @REPLACE_STRNDUP@ -# undef strndup -# define strndup rpl_strndup -# endif -# if @REPLACE_STRNDUP@ || ! @HAVE_DECL_STRNDUP@ -extern char *strndup (char const *__string, size_t __n) _gl_GL_ARG_NONNULL ((1)); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef strndup +# define strndup rpl_strndup +# endif +_gl_GL_FUNCDECL_RPL (strndup, char *, (char const *__string, size_t __n) + _gl_GL_ARG_NONNULL ((1))); +_gl_GL_CXXALIAS_RPL (strndup, char *, (char const *__string, size_t __n)); +# else +# if ! @HAVE_DECL_STRNDUP@ +_gl_GL_FUNCDECL_SYS (strndup, char *, (char const *__string, size_t __n) + _gl_GL_ARG_NONNULL ((1))); +# endif +_gl_GL_CXXALIAS_SYS (strndup, char *, (char const *__string, size_t __n)); # endif +_gl_GL_CXXALIASWARN (strndup); #elif defined GNULIB_POSIXCHECK # undef strndup # if HAVE_RAW_DECL_STRNDUP @@ -231,9 +340,12 @@ return MAXLEN. */ #if @GNULIB_STRNLEN@ # if ! @HAVE_DECL_STRNLEN@ -extern size_t strnlen (char const *__string, size_t __maxlen) - __attribute__ ((__pure__)) _gl_GL_ARG_NONNULL ((1)); +_gl_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__string, size_t __maxlen) + __attribute__ ((__pure__)) + _gl_GL_ARG_NONNULL ((1))); # endif +_gl_GL_CXXALIAS_SYS (strnlen, size_t, (char const *__string, size_t __maxlen)); +_gl_GL_CXXALIASWARN (strnlen); #elif defined GNULIB_POSIXCHECK # undef strnlen # if HAVE_RAW_DECL_STRNLEN @@ -257,8 +369,23 @@ /* Find the first occurrence in S of any character in ACCEPT. */ #if @GNULIB_STRPBRK@ # if ! @HAVE_STRPBRK@ -extern char *strpbrk (char const *__s, char const *__accept) - __attribute__ ((__pure__)) _gl_GL_ARG_NONNULL ((1, 2)); +_gl_GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept) + __attribute__ ((__pure__)) + _gl_GL_ARG_NONNULL ((1, 2))); +# endif + /* On some systems, this function is defined as an overloaded function: + extern "C" { const char * strpbrk (const char *, const char *); } + extern "C++" { char * strpbrk (char *, const char *); } */ +_gl_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 \ + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +_gl_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept)); +_gl_GL_CXXALIASWARN1 (strpbrk, char const *, + (char const *__s, char const *__accept)); +# else +_gl_GL_CXXALIASWARN (strpbrk); # endif # if defined GNULIB_POSIXCHECK /* strpbrk() assumes the second argument is a list of single-byte characters. @@ -316,9 +443,13 @@ See also strtok_r(). */ #if @GNULIB_STRSEP@ # if ! @HAVE_STRSEP@ -extern char *strsep (char **restrict __stringp, char const *restrict __delim) - _gl_GL_ARG_NONNULL ((1, 2)); +_gl_GL_FUNCDECL_SYS (strsep, char *, + (char **restrict __stringp, char const *restrict __delim) + _gl_GL_ARG_NONNULL ((1, 2))); # endif +_gl_GL_CXXALIAS_SYS (strsep, char *, + (char **restrict __stringp, char const *restrict __delim)); +_gl_GL_CXXALIASWARN (strsep); # if defined GNULIB_POSIXCHECK # undef strsep _gl_GL_WARN_ON_USE (strsep, "strsep cannot work correctly on character strings " @@ -335,9 +466,28 @@ #if @GNULIB_STRSTR@ # if @REPLACE_STRSTR@ -# define strstr rpl_strstr -extern char *strstr (const char *haystack, const char *needle) - __attribute__ ((__pure__)) _gl_GL_ARG_NONNULL ((1, 2)); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define strstr rpl_strstr +# endif +_gl_GL_FUNCDECL_RPL (strstr, char *, (const char *haystack, const char *needle) + __attribute__ ((__pure__)) + _gl_GL_ARG_NONNULL ((1, 2))); +_gl_GL_CXXALIAS_RPL (strstr, char *, (const char *haystack, const char *needle)); +# else + /* On some systems, this function is defined as an overloaded function: + extern "C++" { const char * strstr (const char *, const char *); } + extern "C++" { char * strstr (char *, const char *); } */ +_gl_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 \ + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +_gl_GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle)); +_gl_GL_CXXALIASWARN1 (strstr, const char *, + (const char *haystack, const char *needle)); +# else +_gl_GL_CXXALIASWARN (strstr); # endif #elif defined GNULIB_POSIXCHECK /* strstr() does not work with multibyte strings if the locale encoding is @@ -357,11 +507,34 @@ comparison. */ #if @GNULIB_STRCASESTR@ # if @REPLACE_STRCASESTR@ -# define strcasestr rpl_strcasestr +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define strcasestr rpl_strcasestr +# endif +_gl_GL_FUNCDECL_RPL (strcasestr, char *, + (const char *haystack, const char *needle) + __attribute__ ((__pure__)) _gl_GL_ARG_NONNULL ((1, 2))); +_gl_GL_CXXALIAS_RPL (strcasestr, char *, + (const char *haystack, const char *needle)); +# else +# if ! @HAVE_STRCASESTR@ +_gl_GL_FUNCDECL_SYS (strcasestr, char *, + (const char *haystack, const char *needle) + __attribute__ ((__pure__)) _gl_GL_ARG_NONNULL ((1, 2))); +# endif + /* On some systems, this function is defined as an overloaded function: + extern "C++" { const char * strcasestr (const char *, const char *); } + extern "C++" { char * strcasestr (char *, const char *); } */ +_gl_GL_CXXALIAS_SYS_CAST2 (strcasestr, + char *, (const char *haystack, const char *needle), + const char *, (const char *haystack, const char *needle)); # endif -# if ! @HAVE_STRCASESTR@ || @REPLACE_STRCASESTR@ -extern char *strcasestr (const char *haystack, const char *needle) - __attribute__ ((__pure__)) _gl_GL_ARG_NONNULL ((1, 2)); +# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \ + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +_gl_GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle)); +_gl_GL_CXXALIASWARN1 (strcasestr, const char *, + (const char *haystack, const char *needle)); +# else +_gl_GL_CXXALIASWARN (strcasestr); # endif #elif defined GNULIB_POSIXCHECK /* strcasestr() does not work with multibyte strings: @@ -401,16 +574,32 @@ See also strsep(). */ #if @GNULIB_STRTOK_R@ # if @REPLACE_STRTOK_R@ -# undef strtok_r -# define strtok_r rpl_strtok_r -# elif @UNDEFINE_STRTOK_R@ || defined GNULIB_POSIXCHECK -# undef strtok_r -# endif -# if ! @HAVE_DECL_STRTOK_R@ || @REPLACE_STRTOK_R@ -extern char *strtok_r (char *restrict s, char const *restrict delim, - char **restrict save_ptr) - _gl_GL_ARG_NONNULL ((2, 3)); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef strtok_r +# define strtok_r rpl_strtok_r +# endif +_gl_GL_FUNCDECL_RPL (strtok_r, char *, + (char *restrict s, char const *restrict delim, + char **restrict save_ptr) + _gl_GL_ARG_NONNULL ((2, 3))); +_gl_GL_CXXALIAS_RPL (strtok_r, char *, + (char *restrict s, char const *restrict delim, + char **restrict save_ptr)); +# else +# if @UNDEFINE_STRTOK_R@ || defined GNULIB_POSIXCHECK +# undef strtok_r +# endif +# if ! @HAVE_DECL_STRTOK_R@ +_gl_GL_FUNCDECL_SYS (strtok_r, char *, + (char *restrict s, char const *restrict delim, + char **restrict save_ptr) + _gl_GL_ARG_NONNULL ((2, 3))); +# endif +_gl_GL_CXXALIAS_SYS (strtok_r, char *, + (char *restrict s, char const *restrict delim, + char **restrict save_ptr)); # endif +_gl_GL_CXXALIASWARN (strtok_r); # if defined GNULIB_POSIXCHECK _gl_GL_WARN_ON_USE (strtok_r, "strtok_r cannot work correctly on character " "strings in multibyte locales - " @@ -435,15 +624,23 @@ # undef mbslen # endif # if @HAVE_MBSLEN@ /* AIX, OSF/1, MirBSD define mbslen already in libc. */ -# define mbslen rpl_mbslen +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define mbslen rpl_mbslen +# endif +_gl_GL_FUNCDECL_RPL (mbslen, size_t, (const char *string) _gl_GL_ARG_NONNULL ((1))); +_gl_GL_CXXALIAS_RPL (mbslen, size_t, (const char *string)); +# else +_gl_GL_FUNCDECL_SYS (mbslen, size_t, (const char *string) _gl_GL_ARG_NONNULL ((1))); +_gl_GL_CXXALIAS_SYS (mbslen, size_t, (const char *string)); # endif -extern size_t mbslen (const char *string) _gl_GL_ARG_NONNULL ((1)); +_gl_GL_CXXALIASWARN (mbslen); #endif #if @GNULIB_MBSNLEN@ /* Return the number of multibyte characters in the character string starting at STRING and ending at STRING + LEN. */ -extern size_t mbsnlen (const char *string, size_t len) _gl_GL_ARG_NONNULL ((1)); +_gl_GL_EXTERN_C size_t mbsnlen (const char *string, size_t len) + _gl_GL_ARG_NONNULL ((1)); #endif #if @GNULIB_MBSCHR@ @@ -451,8 +648,19 @@ and return a pointer to it. Return NULL if C is not found in STRING. Unlike strchr(), this function works correctly in multibyte locales with encodings such as GB18030. */ -# define mbschr rpl_mbschr /* avoid collision with HP-UX function */ -extern char * mbschr (const char *string, int c) _gl_GL_ARG_NONNULL ((1)); +# if defined __hpux +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define mbschr rpl_mbschr /* avoid collision with HP-UX function */ +# endif +_gl_GL_FUNCDECL_RPL (mbschr, char *, (const char *string, int c) + _gl_GL_ARG_NONNULL ((1))); +_gl_GL_CXXALIAS_RPL (mbschr, char *, (const char *string, int c)); +# else +_gl_GL_FUNCDECL_SYS (mbschr, char *, (const char *string, int c) + _gl_GL_ARG_NONNULL ((1))); +_gl_GL_CXXALIAS_SYS (mbschr, char *, (const char *string, int c)); +# endif +_gl_GL_CXXALIASWARN (mbschr); #endif #if @GNULIB_MBSRCHR@ @@ -460,8 +668,19 @@ and return a pointer to it. Return NULL if C is not found in STRING. Unlike strrchr(), this function works correctly in multibyte locales with encodings such as GB18030. */ -# define mbsrchr rpl_mbsrchr /* avoid collision with HP-UX function */ -extern char * mbsrchr (const char *string, int c) _gl_GL_ARG_NONNULL ((1)); +# if defined __hpux +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define mbsrchr rpl_mbsrchr /* avoid collision with HP-UX function */ +# endif +_gl_GL_FUNCDECL_RPL (mbsrchr, char *, (const char *string, int c) + _gl_GL_ARG_NONNULL ((1))); +_gl_GL_CXXALIAS_RPL (mbsrchr, char *, (const char *string, int c)); +# else +_gl_GL_FUNCDECL_SYS (mbsrchr, char *, (const char *string, int c) + _gl_GL_ARG_NONNULL ((1))); +_gl_GL_CXXALIAS_SYS (mbsrchr, char *, (const char *string, int c)); +# endif +_gl_GL_CXXALIASWARN (mbsrchr); #endif #if @GNULIB_MBSSTR@ @@ -469,7 +688,7 @@ string HAYSTACK. Return NULL if NEEDLE is not found in HAYSTACK. Unlike strstr(), this function works correctly in multibyte locales with encodings different from UTF-8. */ -extern char * mbsstr (const char *haystack, const char *needle) +_gl_GL_EXTERN_C char * mbsstr (const char *haystack, const char *needle) _gl_GL_ARG_NONNULL ((1, 2)); #endif @@ -480,7 +699,7 @@ Note: This function may, in multibyte locales, return 0 for strings of different lengths! Unlike strcasecmp(), this function works correctly in multibyte locales. */ -extern int mbscasecmp (const char *s1, const char *s2) +_gl_GL_EXTERN_C int mbscasecmp (const char *s1, const char *s2) _gl_GL_ARG_NONNULL ((1, 2)); #endif @@ -494,7 +713,7 @@ of different lengths! Unlike strncasecmp(), this function works correctly in multibyte locales. But beware that N is not a byte count but a character count! */ -extern int mbsncasecmp (const char *s1, const char *s2, size_t n) +_gl_GL_EXTERN_C int mbsncasecmp (const char *s1, const char *s2, size_t n) _gl_GL_ARG_NONNULL ((1, 2)); #endif @@ -508,7 +727,7 @@ smaller length than PREFIX! Unlike strncasecmp(), this function works correctly in multibyte locales. */ -extern char * mbspcasecmp (const char *string, const char *prefix) +_gl_GL_EXTERN_C char * mbspcasecmp (const char *string, const char *prefix) _gl_GL_ARG_NONNULL ((1, 2)); #endif @@ -518,7 +737,7 @@ Note: This function may, in multibyte locales, return success even if strlen (haystack) < strlen (needle) ! Unlike strcasestr(), this function works correctly in multibyte locales. */ -extern char * mbscasestr (const char *haystack, const char *needle) +_gl_GL_EXTERN_C char * mbscasestr (const char *haystack, const char *needle) _gl_GL_ARG_NONNULL ((1, 2)); #endif @@ -528,7 +747,7 @@ beginning of the string to this occurrence, or to the end of the string if none exists. Unlike strcspn(), this function works correctly in multibyte locales. */ -extern size_t mbscspn (const char *string, const char *accept) +_gl_GL_EXTERN_C size_t mbscspn (const char *string, const char *accept) _gl_GL_ARG_NONNULL ((1, 2)); #endif @@ -537,9 +756,19 @@ in the character string ACCEPT. Return the pointer to it, or NULL if none exists. Unlike strpbrk(), this function works correctly in multibyte locales. */ -# define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */ -extern char * mbspbrk (const char *string, const char *accept) - _gl_GL_ARG_NONNULL ((1, 2)); +# if defined __hpux +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */ +# endif +_gl_GL_FUNCDECL_RPL (mbspbrk, char *, (const char *string, const char *accept) + _gl_GL_ARG_NONNULL ((1, 2))); +_gl_GL_CXXALIAS_RPL (mbspbrk, char *, (const char *string, const char *accept)); +# else +_gl_GL_FUNCDECL_SYS (mbspbrk, char *, (const char *string, const char *accept) + _gl_GL_ARG_NONNULL ((1, 2))); +_gl_GL_CXXALIAS_SYS (mbspbrk, char *, (const char *string, const char *accept)); +# endif +_gl_GL_CXXALIASWARN (mbspbrk); #endif #if @GNULIB_MBSSPN@ @@ -548,7 +777,7 @@ beginning of the string to this occurrence, or to the end of the string if none exists. Unlike strspn(), this function works correctly in multibyte locales. */ -extern size_t mbsspn (const char *string, const char *reject) +_gl_GL_EXTERN_C size_t mbsspn (const char *string, const char *reject) _gl_GL_ARG_NONNULL ((1, 2)); #endif @@ -567,7 +796,7 @@ Caveat: The identity of the delimiting character is lost. See also mbstok_r(). */ -extern char * mbssep (char **stringp, const char *delim) +_gl_GL_EXTERN_C char * mbssep (char **stringp, const char *delim) _gl_GL_ARG_NONNULL ((1, 2)); #endif @@ -588,17 +817,23 @@ Caveat: The identity of the delimiting character is lost. See also mbssep(). */ -extern char * mbstok_r (char *string, const char *delim, char **save_ptr) +_gl_GL_EXTERN_C char * mbstok_r (char *string, const char *delim, char **save_ptr) _gl_GL_ARG_NONNULL ((2, 3)); #endif /* Map any int, typically from errno, into an error message. */ #if @GNULIB_STRERROR@ # if @REPLACE_STRERROR@ -# undef strerror -# define strerror rpl_strerror -extern char *strerror (int); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef strerror +# define strerror rpl_strerror +# endif +_gl_GL_FUNCDECL_RPL (strerror, char *, (int)); +_gl_GL_CXXALIAS_RPL (strerror, char *, (int)); +# else +_gl_GL_CXXALIAS_SYS (strerror, char *, (int)); # endif +_gl_GL_CXXALIASWARN (strerror); #elif defined GNULIB_POSIXCHECK # undef strerror /* Assume strerror is always declared. */ @@ -608,11 +843,20 @@ #if @GNULIB_STRSIGNAL@ # if @REPLACE_STRSIGNAL@ -# define strsignal rpl_strsignal -# endif -# if ! @HAVE_DECL_STRSIGNAL@ || @REPLACE_STRSIGNAL@ -extern char *strsignal (int __sig); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define strsignal rpl_strsignal +# endif +_gl_GL_FUNCDECL_RPL (strsignal, char *, (int __sig)); +_gl_GL_CXXALIAS_RPL (strsignal, char *, (int __sig)); +# else +# if ! @HAVE_DECL_STRSIGNAL@ +_gl_GL_FUNCDECL_SYS (strsignal, char *, (int __sig)); +# endif +/* Need to cast, because on Cygwin 1.5.x systems, the return type is + 'const char *'. */ +_gl_GL_CXXALIAS_SYS_CAST (strsignal, char *, (int __sig)); # endif +_gl_GL_CXXALIASWARN (strsignal); #elif defined GNULIB_POSIXCHECK # undef strsignal # if HAVE_RAW_DECL_STRSIGNAL @@ -623,8 +867,11 @@ #if @GNULIB_STRVERSCMP@ # if !@HAVE_STRVERSCMP@ -extern int strverscmp (const char *, const char *) _gl_GL_ARG_NONNULL ((1, 2)); +_gl_GL_FUNCDECL_SYS (strverscmp, int, (const char *, const char *) + _gl_GL_ARG_NONNULL ((1, 2))); # endif +_gl_GL_CXXALIAS_SYS (strverscmp, int, (const char *, const char *)); +_gl_GL_CXXALIASWARN (strverscmp); #elif defined GNULIB_POSIXCHECK # undef strverscmp # if HAVE_RAW_DECL_STRVERSCMP @@ -634,9 +881,5 @@ #endif -#ifdef __cplusplus -} -#endif - #endif /* _gl_GL_STRING_H */ #endif /* _gl_GL_STRING_H */ Index: unistd.in.h =================================================================== RCS file: /cvsroot/clisp/clisp/src/gllib/unistd.in.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- unistd.in.h 23 Feb 2010 20:24:47 -0000 1.16 +++ unistd.in.h 17 Mar 2010 16:23:55 -0000 1.17 @@ -114,6 +114,8 @@ # endif #endif +/* The definitions of _gl_GL_FUNCDECL_RPL etc. are copied here. */ + /* The definition of _gl_GL_ARG_NONNULL is copied here. */ /* The definition of _gl_GL_WARN_ON_USE is copied here. */ @@ -141,25 +143,36 @@ /* Declare overridden functions. */ [...1011 lines suppressed...] -#endif - - -#ifdef __cplusplus -} +# if @REPLACE_WRITE@ && @GNULIB_UNISTD_H_SIGPIPE@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef write +# define write rpl_write +# endif +_gl_GL_FUNCDECL_RPL (write, ssize_t, (int fd, const void *buf, size_t count) + _gl_GL_ARG_NONNULL ((2))); +_gl_GL_CXXALIAS_RPL (write, ssize_t, (int fd, const void *buf, size_t count)); +# else +_gl_GL_CXXALIAS_SYS (write, ssize_t, (int fd, const void *buf, size_t count)); +# endif +_gl_GL_CXXALIASWARN (write); #endif Index: sys_time.in.h =================================================================== RCS file: /cvsroot/clisp/clisp/src/gllib/sys_time.in.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- sys_time.in.h 23 Feb 2010 20:24:47 -0000 1.4 +++ sys_time.in.h 17 Mar 2010 16:23:55 -0000 1.5 @@ -39,13 +39,15 @@ # include <time.h> # endif +/* The definitions of _gl_GL_FUNCDECL_RPL etc. are copied here. */ + /* The definition of _gl_GL_ARG_NONNULL is copied here. */ /* The definition of _gl_GL_WARN_ON_USE is copied here. */ -#ifdef __cplusplus +# ifdef __cplusplus extern "C" { -#endif +# endif # if ! @HAVE_STRUCT_TIMEVAL@ struct timeval @@ -55,15 +57,33 @@ }; # endif +# ifdef __cplusplus +} +# endif + # if @GNULIB_GETTIMEOFDAY@ # if @REPLACE_GETTIMEOFDAY@ -# undef gettimeofday -# define gettimeofday rpl_gettimeofday -# endif -# if @REPLACE_GETTIMEOFDAY@ || !@HAVE_GETTIMEOFDAY@ -extern int gettimeofday (struct timeval *restrict, void *restrict) - _gl_GL_ARG_NONNULL ((1)); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef gettimeofday +# define gettimeofday rpl_gettimeofday +# endif +_gl_GL_FUNCDECL_RPL (gettimeofday, int, + (struct timeval *restrict, void *restrict) + _gl_GL_ARG_NONNULL ((1))); +_gl_GL_CXXALIAS_RPL (gettimeofday, int, + (struct timeval *restrict, void *restrict)); +# else +# if !@HAVE_GETTIMEOFDAY@ +_gl_GL_FUNCDECL_SYS (gettimeofday, int, + (struct timeval *restrict, void *restrict) + _gl_GL_ARG_NONNULL ((1))); +# endif +/* Need to cast, because on glibc systems, by default, the second argument is + struct timezone *. */ +_gl_GL_CXXALIAS_SYS_CAST (gettimeofday, int, + (struct timeval *restrict, void *restrict)); # endif +_gl_GL_CXXALIASWARN (gettimeofday); # elif defined GNULIB_POSIXCHECK # undef gettimeofday # if HAVE_RAW_DECL_GETTIMEOFDAY @@ -72,8 +92,4 @@ # endif # endif -#ifdef __cplusplus -} -#endif - #endif /* _gl_GL_SYS_TIME_H */ Index: langinfo.in.h =================================================================== RCS file: /cvsroot/clisp/clisp/src/gllib/langinfo.in.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- langinfo.in.h 23 Feb 2010 20:24:47 -0000 1.1 +++ langinfo.in.h 17 Mar 2010 16:23:55 -0000 1.2 @@ -123,14 +123,12 @@ #endif +/* The definitions of _gl_GL_FUNCDECL_RPL etc. are copied here. */ + /* The definition of _gl_GL_WARN_ON_USE is copied here. */ /* Declare overridden functions. */ -#ifdef __cplusplus -extern "C" { -#endif - /* Return a piece of locale dependent information. Note: The difference between nl_langinfo (CODESET) and locale_charset () @@ -138,12 +136,19 @@ #if @GNULIB_NL_LANGINFO@ # if @REPLACE_NL_LANGINFO@ -# undef nl_langinfo -# define nl_langinfo rpl_nl_langinfo -# endif -# if !@HAVE_NL_LANGINFO@ || @REPLACE_NL_LANGINFO@ -extern char *nl_langinfo (nl_item item); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef nl_langinfo +# define nl_langinfo rpl_nl_langinfo +# endif +_gl_GL_FUNCDECL_RPL (nl_langinfo, char *, (nl_item item)); +_gl_GL_CXXALIAS_RPL (nl_langinfo, char *, (nl_item item)); +# else +# if !@HAVE_NL_LANGINFO@ +_gl_GL_FUNCDECL_SYS (nl_langinfo, char *, (nl_item item)); +# endif +_gl_GL_CXXALIAS_SYS (nl_langinfo, char *, (nl_item item)); # endif +_gl_GL_CXXALIASWARN (nl_langinfo); #elif defined GNULIB_POSIXCHECK # undef nl_langinfo # if HAVE_RAW_DECL_NL_LANGINFO @@ -153,10 +158,5 @@ #endif -#ifdef __cplusplus -} -#endif - - #endif /* _gl_GL_LANGINFO_H */ #endif /* _gl_GL_LANGINFO_H */ Index: wctype.in.h =================================================================== RCS file: /cvsroot/clisp/clisp/src/gllib/wctype.in.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- wctype.in.h 23 Feb 2010 20:24:47 -0000 1.8 +++ wctype.in.h 17 Mar 2010 16:23:55 -0000 1.9 @@ -54,6 +54,10 @@ #ifndef _gl_GL_WCTYPE_H #define _gl_GL_WCTYPE_H +/* The definitions of _gl_GL_FUNCDECL_RPL etc. are copied here. */ + +/* The definition of _gl_GL_WARN_ON_USE is copied here. */ + /* Define wint_t. (Also done in wchar.in.h.) */ #if !@HAVE_WINT_T@ && !defined wint_t # define wint_t int @@ -62,9 +66,6 @@ # endif #endif -#ifdef __cplusplus -extern "C" { -#endif /* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions. Linux libc5 has <wctype.h> and the functions but they are broken. @@ -93,73 +94,120 @@ /* Linux libc5 has <wctype.h> and the functions but they are broken. */ # if @REPLACE_ISWCNTRL@ -# define iswalnum rpl_iswalnum -# define iswalpha rpl_iswalpha -# define iswblank rpl_iswblank -# define iswcntrl rpl_iswcntrl -# define iswdigit rpl_iswdigit -# define iswgraph rpl_iswgraph -# define iswlower rpl_iswlower -# define iswprint rpl_iswprint -# define iswpunct rpl_iswpunct -# define iswspace rpl_iswspace -# define iswupper rpl_iswupper -# define iswxdigit rpl_iswxdigit -# define towlower rpl_towlower -# define towupper rpl_towupper +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define iswalnum rpl_iswalnum +# define iswalpha rpl_iswalpha +# define iswblank rpl_iswblank +# define iswcntrl rpl_iswcntrl +# define iswdigit rpl_iswdigit +# define iswgraph rpl_iswgraph +# define iswlower rpl_iswlower +# define iswprint rpl_iswprint +# define iswpunct rpl_iswpunct +# define iswspace rpl_iswspace +# define iswupper rpl_iswupper +# define iswxdigit rpl_iswxdigit +# define towlower rpl_towlower +# define towupper rpl_towupper +# endif # endif static inline int -iswalnum (wint_t wc) +# if @REPLACE_ISWCNTRL@ +rpl_iswalnum +# else +iswalnum +# endif + (wint_t wc) { return ((wc >= '0' && wc <= '9') || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')); } static inline int -iswalpha (wint_t wc) +# if @REPLACE_ISWCNTRL@ +rpl_iswalpha +# else +iswalpha +# endif + (wint_t wc) { return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'; } static inline int -iswblank (wint_t wc) +# if @REPLACE_ISWCNTRL@ +rpl_iswblank +# else +iswblank +# endif + (wint_t wc) { return wc == ' ' || wc == '\t'; } static inline int -iswcntrl (wint_t wc) +# if @REPLACE_ISWCNTRL@ +rpl_iswcntrl +# else +iswcntrl +# endif + (wint_t wc) { return (wc & ~0x1f) == 0 || wc == 0x7f; } static inline int -iswdigit (wint_t wc) +# if @REPLACE_ISWCNTRL@ +rpl_iswdigit +# else +iswdigit +# endif + (wint_t wc) { return wc >= '0' && wc <= '9'; } static inline int -iswgraph (wint_t wc) +# if @REPLACE_ISWCNTRL@ +rpl_iswgraph +# else +iswgraph +# endif + (wint_t wc) { return wc >= '!' && wc <= '~'; } static inline int -iswlower (wint_t wc) +# if @REPLACE_ISWCNTRL@ +rpl_iswlower +# else +iswlower +# endif + (wint_t wc) { return wc >= 'a' && wc <= 'z'; } static inline int -iswprint (wint_t wc) +# if @REPLACE_ISWCNTRL@ +rpl_iswprint +# else +iswprint +# endif + (wint_t wc) { return wc >= ' ' && wc <= '~'; } static inline int -iswpunct (wint_t wc) +# if @REPLACE_ISWCNTRL@ +rpl_iswpunct +# else +iswpunct +# endif + (wint_t wc) { return (wc >= '!' && wc <= '~' && !((wc >= '0' && wc <= '9') @@ -167,33 +215,58 @@ } static inline int -iswspace (wint_t wc) +# if @REPLACE_ISWCNTRL@ +rpl_iswspace +# else +iswspace +# endif + (wint_t wc) { return (wc == ' ' || wc == '\t' || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r'); } static inline int -iswupper (wint_t wc) +# if @REPLACE_ISWCNTRL@ +rpl_iswupper +# else +iswupper +# endif + (wint_t wc) { return wc >= 'A' && wc <= 'Z'; } static inline int -iswxdigit (wint_t wc) +# if @REPLACE_ISWCNTRL@ +rpl_iswxdigit +# else +iswxdigit +# endif + (wint_t wc) { return ((wc >= '0' && wc <= '9') || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F')); } static inline wint_t -towlower (wint_t wc) +# if @REPLACE_ISWCNTRL@ +rpl_towlower +# else +towlower +# endif + (wint_t wc) { return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc); } static inline wint_t -towupper (wint_t wc) +# if @REPLACE_ISWCNTRL@ +rpl_towupper +# else +towupper +# endif + (wint_t wc) { return (wc >= 'a' && wc <= 'z' ? wc - 'a' + 'A' : wc); } @@ -220,20 +293,71 @@ { return (wint_t) (wchar_t) towlower (wc); } -# define towlower rpl_towlower +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define towlower rpl_towlower +# endif static inline wint_t rpl_towupper (wint_t wc) { return (wint_t) (wchar_t) towupper (wc); } -# define towupper rpl_towupper +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define towupper rpl_towupper +# endif #endif /* __MINGW32__ */ -#ifdef __cplusplus -} +#if @REPLACE_ISWCNTRL@ +_gl_GL_CXXALIAS_RPL (iswalnum, int, (wint_t wc)); +_gl_GL_CXXALIAS_RPL (iswalpha, int, (wint_t wc)); +_gl_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc)); +_gl_GL_CXXALIAS_RPL (iswcntrl, int, (wint_t wc)); +_gl_GL_CXXALIAS_RPL (iswdigit, int, (wint_t wc)); +_gl_GL_CXXALIAS_RPL (iswgraph, int, (wint_t wc)); +_gl_GL_CXXALIAS_RPL (iswlower, int, (wint_t wc)); +_gl_GL_CXXALIAS_RPL (iswprint, int, (wint_t wc)); +_gl_GL_CXXALIAS_RPL (iswpunct, int, (wint_t wc)); +_gl_GL_CXXALIAS_RPL (iswspace, int, (wint_t wc)); +_gl_GL_CXXALIAS_RPL (iswupper, int, (wint_t wc)); +_gl_GL_CXXALIAS_RPL (iswxdigit, int, (wint_t wc)); +#else +_gl_GL_CXXALIAS_SYS (iswalnum, int, (wint_t wc)); +_gl_GL_CXXALIAS_SYS (iswalpha, int, (wint_t wc)); +_gl_GL_CXXALIAS_SYS (iswblank, int, (wint_t wc)); +_gl_GL_CXXALIAS_SYS (iswcntrl, int, (wint_t wc)); +_gl_GL_CXXALIAS_SYS (iswdigit, int, (wint_t wc)); +_gl_GL_CXXALIAS_SYS (iswgraph, int, (wint_t wc)); +_gl_GL_CXXALIAS_SYS (iswlower, int, (wint_t wc)); +_gl_GL_CXXALIAS_SYS (iswprint, int, (wint_t wc)); +_gl_GL_CXXALIAS_SYS (iswpunct, int, (wint_t wc)); +_gl_GL_CXXALIAS_SYS (iswspace, int, (wint_t wc)); +_gl_GL_CXXALIAS_SYS (iswupper, int, (wint_t wc)); +_gl_GL_CXXALIAS_SYS (iswxdigit, int, (wint_t wc)); +#endif +_gl_GL_CXXALIASWARN (iswalnum); +_gl_GL_CXXALIASWARN (iswalpha); +_gl_GL_CXXALIASWARN (iswblank); +_gl_GL_CXXALIASWARN (iswcntrl); +_gl_GL_CXXALIASWARN (iswdigit); +_gl_GL_CXXALIASWARN (iswgraph); +_gl_GL_CXXALIASWARN (iswlower); +_gl_GL_CXXALIASWARN (iswprint); +_gl_GL_CXXALIASWARN (iswpunct); +_gl_GL_CXXALIASWARN (iswspace); +_gl_GL_CXXALIASWARN (iswupper); +_gl_GL_CXXALIASWARN (iswxdigit); + +#if @REPLACE_ISWCNTRL@ || defined __MINGW32__ +_gl_GL_CXXALIAS_RPL (towlower, wint_t, (wint_t wc)); +_gl_GL_CXXALIAS_RPL (towupper, wint_t, (wint_t wc)); +#else +_gl_GL_CXXALIAS_SYS (towlower, wint_t, (wint_t wc)); +_gl_GL_CXXALIAS_SYS (towupper, wint_t, (wint_t wc)); #endif +_gl_GL_CXXALIASWARN (towlower); +_gl_GL_CXXALIASWARN (towupper); + #endif /* _gl_GL_WCTYPE_H */ #endif /* _gl_GL_WCTYPE_H */ Index: wchar.in.h =================================================================== RCS file: /cvsroot/clisp/clisp/src/gllib/wchar.in.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- wchar.in.h 23 Feb 2010 20:24:47 -0000 1.8 +++ wchar.in.h 17 Mar 2010 16:23:55 -0000 1.9 @@ -75,14 +75,12 @@ #ifndef _gl_GL_WCHAR_H #define _gl_GL_WCHAR_H +/* The definitions of _gl_GL_FUNCDECL_RPL etc. are copied here. */ + /* The definition of _gl_GL_ARG_NONNULL is copied here. */ /* The definition of _gl_GL_WARN_ON_USE is copied here. */ -#ifdef __cplusplus -extern "C" { -#endif - /* Define wint_t. (Also done in wctype.in.h.) */ #if !@HAVE_WINT_T@ && !defined wint_t @@ -107,12 +105,19 @@ /* Convert a single-byte character to a wide character. */ #if @GNULIB_BTOWC@ # if @REPLACE_BTOWC@ -# undef btowc -# define btowc rpl_btowc -# endif -# if !@HAVE_BTOWC@ || @REPLACE_BTOWC@ -extern wint_t btowc (int c); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef btowc +# define btowc rpl_btowc +# endif +_gl_GL_FUNCDECL_RPL (btowc, wint_t, (int c)); +_gl_GL_CXXALIAS_RPL (btowc, wint_t, (int c)); +# else +# if !@HAVE_BTOWC@ +_gl_GL_FUNCDECL_SYS (btowc, wint_t, (int c)); +# endif +_gl_GL_CXXALIAS_SYS (btowc, wint_t, (int c)); # endif +_gl_GL_CXXALIASWARN (btowc); #elif defined GNULIB_POSIXCHECK # undef btowc # if HAVE_RAW_DECL_BTOWC @@ -125,13 +130,20 @@ /* Convert a wide character to a single-byte character. */ #if @GNULIB_WCTOB@ # if @REPLACE_WCTOB@ -# undef wctob -# define wctob rpl_wctob -# endif -# if (!defined wctob && !@HAVE_DECL_WCTOB@) || @REPLACE_WCTOB@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wctob +# define wctob rpl_wctob +# endif +_gl_GL_FUNCDECL_RPL (wctob, int, (wint_t wc)); +_gl_GL_CXXALIAS_RPL (wctob, int, (wint_t wc)); +# else +# if !defined wctob && !@HAVE_DECL_WCTOB@ /* wctob is provided by gnulib, or wctob exists but is not declared. */ -extern int wctob (wint_t wc); +_gl_GL_FUNCDECL_SYS (wctob, int, (wint_t wc)); +# endif +_gl_GL_CXXALIAS_SYS (wctob, int, (wint_t wc)); # endif +_gl_GL_CXXALIASWARN (wctob); #elif defined GNULIB_POSIXCHECK # undef wctob # if HAVE_RAW_DECL_WCTOB @@ -144,12 +156,19 @@ /* Test whether *PS is in the initial state. */ #if @GNULIB_MBSINIT@ # if @REPLACE_MBSINIT@ -# undef mbsinit -# define mbsinit rpl_mbsinit -# endif -# if !@HAVE_MBSINIT@ || @REPLACE_MBSINIT@ -extern int mbsinit (const mbstate_t *ps); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mbsinit +# define mbsinit rpl_mbsinit +# endif +_gl_GL_FUNCDECL_RPL (mbsinit, int, (const mbstate_t *ps)); +_gl_GL_CXXALIAS_RPL (mbsinit, int, (const mbstate_t *ps)); +# else +# if !@HAVE_MBSINIT@ +_gl_GL_FUNCDECL_SYS (mbsinit, int, (const mbstate_t *ps)); +# endif +_gl_GL_CXXALIAS_SYS (mbsinit, int, (const mbstate_t *ps)); # endif +_gl_GL_CXXALIASWARN (mbsinit); #elif defined GNULIB_POSIXCHECK # undef mbsinit # if HAVE_RAW_DECL_MBSINIT @@ -162,12 +181,23 @@ /* Convert a multibyte character to a wide character. */ #if @GNULIB_MBRTOWC@ # if @REPLACE_MBRTOWC@ -# undef mbrtowc -# define mbrtowc rpl_mbrtowc -# endif -# if !@HAVE_MBRTOWC@ || @REPLACE_MBRTOWC@ -extern size_t mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mbrtowc +# define mbrtowc rpl_mbrtowc +# endif +_gl_GL_FUNCDECL_RPL (mbrtowc, size_t, + (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); +_gl_GL_CXXALIAS_RPL (mbrtowc, size_t, + (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); +# else +# if !@HAVE_MBRTOWC@ +_gl_GL_FUNCDECL_SYS (mbrtowc, size_t, + (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); +# endif +_gl_GL_CXXALIAS_SYS (mbrtowc, size_t, + (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); # endif +_gl_GL_CXXALIASWARN (mbrtowc); #elif defined GNULIB_POSIXCHECK # undef mbrtowc # if HAVE_RAW_DECL_MBRTOWC @@ -180,12 +210,19 @@ /* Recognize a multibyte character. */ #if @GNULIB_MBRLEN@ # if @REPLACE_MBRLEN@ -# undef mbrlen -# define mbrlen rpl_mbrlen -# endif -# if !@HAVE_MBRLEN@ || @REPLACE_MBRLEN@ -extern size_t mbrlen (const char *s, size_t n, mbstate_t *ps); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mbrlen +# define mbrlen rpl_mbrlen +# endif +_gl_GL_FUNCDECL_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); +_gl_GL_CXXALIAS_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); +# else +# if !@HAVE_MBRLEN@ +_gl_GL_FUNCDECL_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); +# endif +_gl_GL_CXXALIAS_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); # endif +_gl_GL_CXXALIASWARN (mbrlen); #elif defined GNULIB_POSIXCHECK # undef mbrlen # if HAVE_RAW_DECL_MBRLEN @@ -198,13 +235,27 @@ /* Convert a string to a wide string. */ #if @GNULIB_MBSRTOWCS@ # if @REPLACE_MBSRTOWCS@ -# undef mbsrtowcs -# define mbsrtowcs rpl_mbsrtowcs -# endif -# if !@HAVE_MBSRTOWCS@ || @REPLACE_MBSRTOWCS@ -extern size_t mbsrtowcs (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps) - _gl_GL_ARG_NONNULL ((2)); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mbsrtowcs +# define mbsrtowcs rpl_mbsrtowcs +# endif +_gl_GL_FUNCDECL_RPL (mbsrtowcs, size_t, + (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps) + _gl_GL_ARG_NONNULL ((2))); +_gl_GL_CXXALIAS_RPL (mbsrtowcs, size_t, + (wchar_t *dest, const char **srcp, size_t len, + mbstate_t *ps)); +# else +# if !@HAVE_MBSRTOWCS@ +_gl_GL_FUNCDECL_SYS (mbsrtowcs, size_t, + (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps) + _gl_GL_ARG_NONNULL ((2))); +# endif +_gl_GL_CXXALIAS_SYS (mbsrtowcs, size_t, + (wchar_t *dest, const char **srcp, size_t len, + mbstate_t *ps)); # endif +_gl_GL_CXXALIASWARN (mbsrtowcs); #elif defined GNULIB_POSIXCHECK # undef mbsrtowcs # if HAVE_RAW_DECL_MBSRTOWCS @@ -217,13 +268,29 @@ /* Convert a string to a wide string. */ #if @GNULIB_MBSNRTOWCS@ # if @REPLACE_MBSNRTOWCS@ -# undef mbsnrtowcs -# define mbsnrtowcs rpl_mbsnrtowcs -# endif -# if !@HAVE_MBSNRTOWCS@ || @REPLACE_MBSNRTOWCS@ -extern size_t mbsnrtowcs (wchar_t *dest, const char **srcp, size_t srclen, size_t len, mbstate_t *ps) - _gl_GL_ARG_NONNULL ((2)); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mbsnrtowcs +# define mbsnrtowcs rpl_mbsnrtowcs +# endif +_gl_GL_FUNCDECL_RPL (mbsnrtowcs, size_t, + (wchar_t *dest, const char **srcp, size_t srclen, size_t len, + mbstate_t *ps) + _gl_GL_ARG_NONNULL ((2))); +_gl_GL_CXXALIAS_RPL (mbsnrtowcs, size_t, + (wchar_t *dest, const char **srcp, size_t srclen, size_t len, + mbstate_t *ps)); +# else +# if !@HAVE_MBSNRTOWCS@ +_gl_GL_FUNCDECL_SYS (mbsnrtowcs, size_t, + (wchar_t *dest, const char **srcp, size_t srclen, size_t len, + mbstate_t *ps) + _gl_GL_ARG_NONNULL ((2))); +# endif +_gl_GL_CXXALIAS_SYS (mbsnrtowcs, size_t, + (wchar_t *dest, const char **srcp, size_t srclen, size_t len, + mbstate_t *ps)); # endif +_gl_GL_CXXALIASWARN (mbsnrtowcs); #elif defined GNULIB_POSIXCHECK # undef mbsnrtowcs # if HAVE_RAW_DECL_MBSNRTOWCS @@ -236,12 +303,19 @@ /* Convert a wide character to a multibyte character. */ #if @GNULIB_WCRTOMB@ # if @REPLACE_WCRTOMB@ -# undef wcrtomb -# define wcrtomb rpl_wcrtomb -# endif -# if !@HAVE_WCRTOMB@ || @REPLACE_WCRTOMB@ -extern size_t wcrtomb (char *s, wchar_t wc, mbstate_t *ps); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wcrtomb +# define wcrtomb rpl_wcrtomb +# endif +_gl_GL_FUNCDECL_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); +_gl_GL_CXXALIAS_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); +# else +# if !@HAVE_WCRTOMB@ +_gl_GL_FUNCDECL_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); +# endif +_gl_GL_CXXALIAS_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); # endif +_gl_GL_CXXALIASWARN (wcrtomb); #elif defined GNULIB_POSIXCHECK # undef wcrtomb # if HAVE_RAW_DECL_WCRTOMB @@ -254,13 +328,27 @@ /* Convert a wide string to a string. */ #if @GNULIB_WCSRTOMBS@ # if @REPLACE_WCSRTOMBS@ -# undef wcsrtombs -# define wcsrtombs rpl_wcsrtombs -# endif -# if !@HAVE_WCSRTOMBS@ || @REPLACE_WCSRTOMBS@ -extern size_t wcsrtombs (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps) - _gl_GL_ARG_NONNULL ((2)); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wcsrtombs +# define wcsrtombs rpl_wcsrtombs +# endif +_gl_GL_FUNCDECL_RPL (wcsrtombs, size_t, + (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps) + _gl_GL_ARG_NONNULL ((2))); +_gl_GL_CXXALIAS_RPL (wcsrtombs, size_t, + (char *dest, const wchar_t **srcp, size_t len, + mbstate_t *ps)); +# else +# if !@HAVE_WCSRTOMBS@ +_gl_GL_FUNCDECL_SYS (wcsrtombs, size_t, + (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps) + _gl_GL_ARG_NONNULL ((2))); +# endif +_gl_GL_CXXALIAS_SYS (wcsrtombs, size_t, + (char *dest, const wchar_t **srcp, size_t len, + mbstate_t *ps)); # endif +_gl_GL_CXXALIASWARN (wcsrtombs); #elif defined GNULIB_POSIXCHECK # undef wcsrtombs # if HAVE_RAW_DECL_WCSRTOMBS @@ -273,13 +361,29 @@ /* Convert a wide string to a string. */ #if @GNULIB_WCSNRTOMBS@ # if @REPLACE_WCSNRTOMBS@ -# undef wcsnrtombs -# define wcsnrtombs rpl_wcsnrtombs -# endif -# if !@HAVE_WCSNRTOMBS@ || @REPLACE_WCSNRTOMBS@ -extern size_t wcsnrtombs (char *dest, const wchar_t **srcp, size_t srclen, size_t len, mbstate_t *ps) - _gl_GL_ARG_NONNULL ((2)); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wcsnrtombs +# define wcsnrtombs rpl_wcsnrtombs +# endif +_gl_GL_FUNCDECL_RPL (wcsnrtombs, size_t, + (char *dest, const wchar_t **srcp, size_t srclen, size_t len, + mbstate_t *ps) + _gl_GL_ARG_NONNULL ((2))); +_gl_GL_CXXALIAS_RPL (wcsnrtombs, size_t, + (char *dest, const wchar_t **srcp, size_t srclen, size_t len, + mbstate_t *ps)); +# else +# if !@HAVE_WCSNRTOMBS@ +_gl_GL_FUNCDECL_SYS (wcsnrtombs, size_t, + (char *dest, const wchar_t **srcp, size_t srclen, size_t len, + mbstate_t *ps) + _gl_GL_ARG_NONNULL ((2))); +# endif +_gl_GL_CXXALIAS_SYS (wcsnrtombs, size_t, + (char *dest, const wchar_t **srcp, size_t srclen, size_t len, + mbstate_t *ps)); # endif +_gl_GL_CXXALIASWARN (wcsnrtombs); #elif defined GNULIB_POSIXCHECK # undef wcsnrtombs # if HAVE_RAW_DECL_WCSNRTOMBS @@ -292,15 +396,20 @@ /* Return the number of screen columns needed for WC. */ #if @GNULIB_WCWIDTH@ # if @REPLACE_WCWIDTH@ -# undef wcwidth -# define wcwidth rpl_wcwidth -extern int wcwidth (wchar_t); +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wcwidth +# define wcwidth rpl_wcwidth +# endif +_gl_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t)); +_gl_GL_CXXALIAS_RPL (wcwidth, int, (wchar_t)); # else # if !defined wcwidth && !@HAVE_DECL_WCWIDTH@ /* wcwidth exists but is not declared. */ -extern int wcwidth (int /* actually wchar_t */); +_gl_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t)); # endif +_gl_GL_CXXALIAS_SYS (wcwidth, int, (wchar_t)); # endif +_gl_GL_CXXALIASWARN (wcwidth); #elif defined GNULIB_POSIXCHECK # undef wcwidth # if HAVE_RAW_DECL_WCWIDTH @@ -310,10 +419,6 @@ #endif -#ifdef __cplusplus -} -#endif - #endif /* _gl_GL_WCHAR_H */ #endif /* _gl_GL_WCHAR_H */ #endif ------------------------------ ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev ------------------------------ _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest, Vol 47, Issue 9 **************************************** |