clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  Remove unused PHP_AC_BROKEN_SNPRINTF m4 macro
This commit is contained in:
Peter Kokot 2019-02-27 21:20:49 +01:00
commit 8035e84881
4 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
acinclude.m4
View File

@ -1435,43 +1435,6 @@ AC_DEFUN([PHP_MISSING_FCLOSE_DECL],[
])
])
dnl
dnl PHP_AC_BROKEN_SNPRINTF
dnl
dnl Check for broken snprintf(), C99 conformance
dnl
AC_DEFUN([PHP_AC_BROKEN_SNPRINTF],[
AC_CACHE_CHECK(whether snprintf is broken, ac_cv_broken_snprintf,[
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#define NULL (0L)
main() {
char buf[20];
int res = 0;
res = res || (snprintf(buf, 2, "marcus") != 6);
res = res || (buf[1] != '\0');
/* Implementations may consider this as an encoding error */
snprintf(buf, 0, "boerger");
/* However, they MUST ignore the pointer */
res = res || (buf[0] != 'm');
res = res || (snprintf(NULL, 0, "boerger") != 7);
res = res || (snprintf(buf, sizeof(buf), "%f", 0.12345678) != 8);
exit(res);
}
]])],[
ac_cv_broken_snprintf=no
],[
ac_cv_broken_snprintf=yes
],[
ac_cv_broken_snprintf=no
])
])
if test "$ac_cv_broken_snprintf" = "yes"; then
AC_DEFINE(PHP_BROKEN_SNPRINTF, 1, [Whether snprintf is C99 conform])
else
AC_DEFINE(PHP_BROKEN_SNPRINTF, 0, [Whether snprintf is C99 conform])
fi
])
dnl
dnl PHP_SOCKADDR_CHECKS
dnl

3
configure.ac
View File

@ -650,7 +650,6 @@ setsockopt \
setvbuf \
shutdown \
sin \
snprintf \
srand48 \
srandom \
statfs \
@ -672,7 +671,6 @@ unlockpt \
unsetenv \
usleep \
utime \
vsnprintf \
vasprintf \
asprintf \
nanosleep \
@ -736,7 +734,6 @@ fi
AC_REPLACE_FUNCS(strlcat strlcpy explicit_bzero getopt)
AC_FUNC_ALLOCA
dnl PHP_AC_BROKEN_SNPRINTF
PHP_DECLARED_TIMEZONE
PHP_TIME_R_TYPE
PHP_READDIR_R_TYPE

2
main/spprintf.h
View File

@ -33,4 +33,4 @@ END_EXTERN_C()
#define vspprintf zend_vspprintf
#define vstrpprintf zend_vstrpprintf
#endif /* SNPRINTF_H */
#endif /* SPPRINTF_H */

2
win32/build/config.w32.h.in
View File

@ -86,8 +86,6 @@
# define HAVE_SETVBUF 1
#endif
#define HAVE_SHUTDOWN 1
#define HAVE_SNPRINTF 1
#define HAVE_VSNPRINTF 1
#define HAVE_STRCASECMP 1
#define HAVE_STRDUP 1
#define HAVE_STRERROR 1