diff options
| -rwxr-xr-x | Configure | 69 | ||||
| -rw-r--r-- | Cross/config.sh-arm-linux | 2 | ||||
| -rw-r--r-- | Cross/config.sh-arm-linux-n770 | 2 | ||||
| -rw-r--r-- | NetWare/config.wc | 2 | ||||
| -rw-r--r-- | Porting/Glossary | 10 | ||||
| -rw-r--r-- | Porting/config.sh | 2 | ||||
| -rw-r--r-- | Porting/config_H | 11 | ||||
| -rwxr-xr-x | config_h.SH | 11 | ||||
| -rw-r--r-- | configure.com | 4 | ||||
| -rw-r--r-- | perl.h | 2 | ||||
| -rw-r--r-- | plan9/config_sh.sample | 2 | ||||
| -rw-r--r-- | symbian/config.sh | 2 | ||||
| -rw-r--r-- | uconfig.h | 15 | ||||
| -rw-r--r-- | uconfig.sh | 2 | ||||
| -rw-r--r-- | uconfig64.sh | 2 | ||||
| -rw-r--r-- | win32/config.ce | 2 | ||||
| -rw-r--r-- | win32/config.vc | 2 | ||||
| -rw-r--r-- | win32/config_H.gc | 11 | ||||
| -rw-r--r-- | win32/config_H.vc | 11 |
19 files changed, 3 insertions, 161 deletions
@@ -809,8 +809,6 @@ d_signbit='' d_sigprocmask='' d_sigsetjmp='' usesitecustomize='' -d_snprintf='' -d_vsnprintf='' d_sockatmark='' d_sockatmarkproto='' d_ip_mreq='' @@ -18786,71 +18784,6 @@ set d_sigsetjmp eval $setvar $rm_try -: see if snprintf exists -set snprintf d_snprintf -eval $inlibc - -: see if vsnprintf exists -set vsnprintf d_vsnprintf -eval $inlibc - -case "$d_snprintf-$d_vsnprintf" in -"$define-$define") - $cat <<EOM -Checking whether your snprintf() and vsnprintf() work okay... -EOM - $cat >try.c <<'EOCP' -/* v?snprintf testing logic courtesy of Russ Allbery. - * According to C99: - * - if the buffer is too short it still must be \0-terminated - * - if the buffer is too short the potentially required length - * must be returned and not -1 - * - if the buffer is NULL the potentially required length - * must be returned and not -1 or core dump - */ -#include <stdio.h> -#include <stdarg.h> - -char buf[2]; - -int test (char *format, ...) -{ - va_list args; - int count; - - va_start (args, format); - count = vsnprintf (buf, sizeof buf, format, args); - va_end (args); - return count; -} - -int main () -{ - return ((test ("%s", "abcd") == 4 && buf[0] == 'a' && buf[1] == '\0' - && snprintf (NULL, 0, "%s", "abcd") == 4) ? 0 : 1); -} -EOCP - set try - if eval $compile; then - `$run ./try` - case "$?" in - 0) echo "Your snprintf() and vsnprintf() seem to be working okay." ;; - *) cat <<EOM >&4 -Your snprintf() and snprintf() don't seem to be working okay. -EOM - d_snprintf="$undef" - d_vsnprintf="$undef" - ;; - esac - else - echo "(I can't seem to compile the test program--assuming they don't)" - d_snprintf="$undef" - d_vsnprintf="$undef" - fi - $rm_try - ;; -esac - : see if sockatmark exists set sockatmark d_sockatmark eval $inlibc @@ -24812,7 +24745,6 @@ d_sigprocmask='$d_sigprocmask' d_sigsetjmp='$d_sigsetjmp' d_sin6_scope_id='$d_sin6_scope_id' d_sitearch='$d_sitearch' -d_snprintf='$d_snprintf' d_sockaddr_in6='$d_sockaddr_in6' d_sockaddr_sa_len='$d_sockaddr_sa_len' d_sockatmark='$d_sockatmark' @@ -24906,7 +24838,6 @@ d_void_closedir='$d_void_closedir' d_voidsig='$d_voidsig' d_voidtty='$d_voidtty' d_vprintf='$d_vprintf' -d_vsnprintf='$d_vsnprintf' d_wait4='$d_wait4' d_waitpid='$d_waitpid' d_wcscmp='$d_wcscmp' diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux index 51fca473e8..a8c322d155 100644 --- a/Cross/config.sh-arm-linux +++ b/Cross/config.sh-arm-linux @@ -531,7 +531,6 @@ d_sigprocmask='define' d_sigsetjmp='define' d_sin6_scope_id='undef' d_sitearch='define' -d_snprintf='undef' d_sockaddr_in6='undef' d_sockaddr_sa_len='undef' d_sockatmark='undef' @@ -625,7 +624,6 @@ d_void_closedir='undef' d_voidsig='define' d_voidtty='' d_vprintf='define' -d_vsnprintf='define' d_wait4='define' d_waitpid='define' d_wcscmp='undef' diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770 index 1739595746..b0278a5b3d 100644 --- a/Cross/config.sh-arm-linux-n770 +++ b/Cross/config.sh-arm-linux-n770 @@ -416,7 +416,6 @@ d_signbit='define' d_sigprocmask='define' d_sigsetjmp='define' d_sitearch='define' -d_snprintf='undef' d_sockatmark='undef' d_sockatmarkproto='undef' d_socket='define' @@ -497,7 +496,6 @@ d_void_closedir='undef' d_voidsig='define' d_voidtty='' d_vprintf='define' -d_vsnprintf='define' d_wait4='define' d_waitpid='define' d_wcstombs='define' diff --git a/NetWare/config.wc b/NetWare/config.wc index 31593db2a6..c66b498609 100644 --- a/NetWare/config.wc +++ b/NetWare/config.wc @@ -521,7 +521,6 @@ d_sigprocmask='undef' d_sigsetjmp='undef' d_sin6_scope_id='undef' d_sitearch='undef' -d_snprintf='undef' d_sockaddr_in6='undef' d_sockaddr_sa_len='undef' d_sockatmark='undef' @@ -614,7 +613,6 @@ d_void_closedir='undef' d_voidsig='define' d_voidtty='' d_vprintf='define' -d_vsnprintf='undef' d_wait4='undef' d_waitpid='define' d_wcscmp='undef' diff --git a/Porting/Glossary b/Porting/Glossary index 1e1deab174..62bb5abc53 100644 --- a/Porting/Glossary +++ b/Porting/Glossary @@ -2441,11 +2441,6 @@ d_sitearch (sitearch.U): of architecture-dependent library files for $package. If $sitearch is the same as $archlib, then this is set to undef. -d_snprintf (d_snprintf.U): - This variable conditionally defines the HAS_SNPRINTF symbol, which - indicates to the C program that the snprintf () library function - is available. - d_sockaddr_in6 (d_socket.U): This variable conditionally defines the HAS_SOCKADDR_IN6 symbol, which indicates the availability of a struct sockaddr_in6. @@ -2853,11 +2848,6 @@ d_vprintf (d_vprintf.U): indicates to the C program that the vprintf() routine is available to printf with a pointer to an argument list. -d_vsnprintf (d_snprintf.U): - This variable conditionally defines the HAS_VSNPRINTF symbol, which - indicates to the C program that the vsnprintf () library function - is available. - d_wait4 (d_wait4.U): This variable conditionally defines the HAS_WAIT4 symbol, which indicates the wait4() routine is available. diff --git a/Porting/config.sh b/Porting/config.sh index 61b921ced9..df8d2d699f 100644 --- a/Porting/config.sh +++ b/Porting/config.sh @@ -544,7 +544,6 @@ d_sigprocmask='define' d_sigsetjmp='define' d_sin6_scope_id='define' d_sitearch='define' -d_snprintf='define' d_sockaddr_in6='define' d_sockaddr_sa_len='define' d_sockatmark='define' @@ -638,7 +637,6 @@ d_void_closedir='undef' d_voidsig='define' d_voidtty='' d_vprintf='define' -d_vsnprintf='define' d_wait4='define' d_waitpid='define' d_wcscmp='define' diff --git a/Porting/config_H b/Porting/config_H index 255303e72e..6954758b5f 100644 --- a/Porting/config_H +++ b/Porting/config_H @@ -3559,17 +3559,6 @@ /*#define USE_SITECUSTOMIZE / **/ #endif -/* HAS_SNPRINTF: - * This symbol, if defined, indicates that the snprintf () library - * function is available for use. - */ -/* HAS_VSNPRINTF: - * This symbol, if defined, indicates that the vsnprintf () library - * function is available for use. - */ -#define HAS_SNPRINTF /**/ -#define HAS_VSNPRINTF /**/ - /* HAS_SOCKATMARK: * This symbol, if defined, indicates that the sockatmark routine is * available to test whether a socket is at the out-of-band mark. diff --git a/config_h.SH b/config_h.SH index e2ff49dab0..259a2edcaf 100755 --- a/config_h.SH +++ b/config_h.SH @@ -3427,17 +3427,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un #$usesitecustomize USE_SITECUSTOMIZE /**/ #endif -/* HAS_SNPRINTF: - * This symbol, if defined, indicates that the snprintf () library - * function is available for use. - */ -/* HAS_VSNPRINTF: - * This symbol, if defined, indicates that the vsnprintf () library - * function is available for use. - */ -#$d_snprintf HAS_SNPRINTF /**/ -#$d_vsnprintf HAS_VSNPRINTF /**/ - /* HAS_SOCKATMARK: * This symbol, if defined, indicates that the sockatmark routine is * available to test whether a socket is at the out-of-band mark. diff --git a/configure.com b/configure.com index f3048b84aa..38a1fb23f1 100644 --- a/configure.com +++ b/configure.com @@ -5289,8 +5289,6 @@ $ endif $ d_setgrent = "define" $ d_ttyname_r = "define" $ ttyname_r_proto = "1" -$ d_snprintf = "define" -$ d_vsnprintf = "define" $! $! VMS V7.3-2 powered options $! We know that it is only available for V7.3-2 and later on 64 bit platforms. @@ -6470,7 +6468,6 @@ $ WC "d_void_closedir='define'" $ WC "d_voidsig='undef'" $ WC "d_voidtty='" + "'" $ WC "d_vprintf='define'" -$ WC "d_vsnprintf='" + d_vsnprintf + "'" $ WC "d_wait4='" + d_wait4 + "'" $ WC "d_waitpid='define'" $ WC "d_wcscmp='define'" @@ -6965,7 +6962,6 @@ $ WC "d_setnetent_r='undef'" $ WC "d_setprotoent_r='undef'" $ WC "d_setpwent_r='undef'" $ WC "d_setservent_r='undef'" -$ WC "d_snprintf='" + d_snprintf + "'" $ WC "d_srand48_r='undef'" $ WC "d_srandom_r='undef'" $ WC "d_strerror_l='undef'" @@ -1501,7 +1501,7 @@ EXTERN_C char *crypt(const char *, const char *); # define my_snprintf Perl_my_snprintf # define PERL_MY_SNPRINTF_GUARDED #else -#if defined(HAS_SNPRINTF) && defined(HAS_C99_VARIADIC_MACROS) && !(defined(DEBUGGING) && !defined(PERL_USE_GCC_BRACE_GROUPS)) && !defined(PERL_GCC_PEDANTIC) +#if defined(HAS_C99_VARIADIC_MACROS) && !(defined(DEBUGGING) && !defined(PERL_USE_GCC_BRACE_GROUPS)) && !defined(PERL_GCC_PEDANTIC) # ifdef PERL_USE_GCC_BRACE_GROUPS # define my_snprintf(buffer, max, ...) ({ int len = snprintf(buffer, max, __VA_ARGS__); PERL_SNPRINTF_CHECK(len, max, snprintf); len; }) # define PERL_MY_SNPRINTF_GUARDED diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample index f35bb1fea6..a9e89bb5bc 100644 --- a/plan9/config_sh.sample +++ b/plan9/config_sh.sample @@ -531,7 +531,6 @@ d_sigprocmask='define' d_sigsetjmp='define' d_sin6_scope_id='undef' d_sitearch='define' -d_snprintf='undef' d_sockaddr_in6='undef' d_sockaddr_sa_len='undef' d_sockatmark='undef' @@ -624,7 +623,6 @@ d_void_closedir='undef' d_voidsig='define' d_voidtty='' d_vprintf='define' -d_vsnprintf='undef' d_wait4='undef' d_waitpid='define' d_wcscmp='undef' diff --git a/symbian/config.sh b/symbian/config.sh index 90980d7921..0e04e65029 100644 --- a/symbian/config.sh +++ b/symbian/config.sh @@ -479,7 +479,6 @@ d_sin6_scope_id='undef' d_sitearch='define' d_sitecustomize='undef' d_sitecustomize='undef' -d_snprintf='undef' d_sockaddr_in6='undef' d_sockaddr_sa_len='undef' d_sockatmark='undef' @@ -572,7 +571,6 @@ d_void_closedir='undef' d_voidsig='undef' d_voidtty='' d_vprintf='define' -d_vsnprintf='undef' d_wait4='undef' d_waitpid='undef' d_wcscmp='undef' @@ -3392,17 +3392,6 @@ /*#define USE_SITECUSTOMIZE / **/ #endif -/* HAS_SNPRINTF: - * This symbol, if defined, indicates that the snprintf () library - * function is available for use. - */ -/* HAS_VSNPRINTF: - * This symbol, if defined, indicates that the vsnprintf () library - * function is available for use. - */ -/*#define HAS_SNPRINTF / **/ -/*#define HAS_VSNPRINTF / **/ - /* HAS_SOCKATMARK: * This symbol, if defined, indicates that the sockatmark routine is * available to test whether a socket is at the out-of-band mark. @@ -5357,6 +5346,6 @@ #endif /* Generated from: - * de64a83defbfab2e684766a378e7304e30db7e2e8545430f86e0239f6850ac8a config_h.SH - * 034e09d42cd2ce87573eb1bd11b7169cb5a57d0d0741d379d39c1f3c4fc2f24e uconfig.sh + * 6473cc944f55c251c871ab2c2b621b94505098ecf710a1d9c1ff2f6ce914ed61 config_h.SH + * ba39162e41cd92a8c139a8885eacd1a562aedede9bc007a19118da3c09fbc3ac uconfig.sh * ex: set ro: */ diff --git a/uconfig.sh b/uconfig.sh index 616eab666f..4710a1d68f 100644 --- a/uconfig.sh +++ b/uconfig.sh @@ -470,7 +470,6 @@ d_sigprocmask='undef' d_sigsetjmp='undef' d_sin6_scope_id='undef' d_sitearch='undef' -d_snprintf='undef' d_sockaddr_in6='undef' d_sockaddr_sa_len='undef' d_sockatmark='undef' @@ -563,7 +562,6 @@ d_void_closedir='undef' d_voidsig='undef' d_voidtty='' d_vprintf='define' -d_vsnprintf='undef' d_wait4='undef' d_waitpid='undef' d_wcscmp='undef' diff --git a/uconfig64.sh b/uconfig64.sh index 0842bad2fc..fbc956bda6 100644 --- a/uconfig64.sh +++ b/uconfig64.sh @@ -471,7 +471,6 @@ d_sigprocmask='undef' d_sigsetjmp='undef' d_sin6_scope_id='undef' d_sitearch='undef' -d_snprintf='undef' d_sockaddr_in6='undef' d_sockaddr_sa_len='undef' d_sockatmark='undef' @@ -564,7 +563,6 @@ d_void_closedir='undef' d_voidsig='undef' d_voidtty='' d_vprintf='define' -d_vsnprintf='undef' d_wait4='undef' d_waitpid='undef' d_wcscmp='undef' diff --git a/win32/config.ce b/win32/config.ce index 8ae01597b7..4bf7f84f06 100644 --- a/win32/config.ce +++ b/win32/config.ce @@ -519,7 +519,6 @@ d_sigprocmask='undef' d_sigsetjmp='undef' d_sin6_scope_id='undef' d_sitearch='define' -d_snprintf='undef' d_sockaddr_in6='undef' d_sockaddr_sa_len='undef' d_sockatmark='undef' @@ -612,7 +611,6 @@ d_void_closedir='undef' d_voidsig='define' d_voidtty='' d_vprintf='define' -d_vsnprintf='undef' d_wait4='undef' d_waitpid='define' d_wcscmp='undef' diff --git a/win32/config.vc b/win32/config.vc index f0dc118b0f..351e8718e4 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -519,7 +519,6 @@ d_sigprocmask='undef' d_sigsetjmp='undef' d_sin6_scope_id='define' d_sitearch='define' -d_snprintf='define' d_sockaddr_in6='undef' d_sockaddr_sa_len='undef' d_sockatmark='undef' @@ -613,7 +612,6 @@ d_void_closedir='undef' d_voidsig='define' d_voidtty='' d_vprintf='define' -d_vsnprintf='define' d_wait4='undef' d_waitpid='define' d_wcscmp='define' diff --git a/win32/config_H.gc b/win32/config_H.gc index ddb834b59c..574dfd8b6e 100644 --- a/win32/config_H.gc +++ b/win32/config_H.gc @@ -3379,17 +3379,6 @@ /*#define USE_SITECUSTOMIZE / **/ #endif -/* HAS_SNPRINTF: - * This symbol, if defined, indicates that the snprintf () library - * function is available for use. - */ -/* HAS_VSNPRINTF: - * This symbol, if defined, indicates that the vsnprintf () library - * function is available for use. - */ -#define HAS_SNPRINTF /**/ -#define HAS_VSNPRINTF /**/ - /* HAS_SOCKATMARK: * This symbol, if defined, indicates that the sockatmark routine is * available to test whether a socket is at the out-of-band mark. diff --git a/win32/config_H.vc b/win32/config_H.vc index 0eb1f8a277..a8871e7570 100644 --- a/win32/config_H.vc +++ b/win32/config_H.vc @@ -3370,17 +3370,6 @@ /*#define USE_SITECUSTOMIZE / **/ #endif -/* HAS_SNPRINTF: - * This symbol, if defined, indicates that the snprintf () library - * function is available for use. - */ -/* HAS_VSNPRINTF: - * This symbol, if defined, indicates that the vsnprintf () library - * function is available for use. - */ -#define HAS_SNPRINTF /**/ -#define HAS_VSNPRINTF /**/ - /* HAS_SOCKATMARK: * This symbol, if defined, indicates that the sockatmark routine is * available to test whether a socket is at the out-of-band mark. |