From b33fa18eabf22d79a21aa95e7fa099fad2574142 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Wed, 20 Feb 2019 23:17:15 +0100 Subject: Remove unused PHP_AC_BROKEN_SPRINTF and AC_ZEND_BROKEN_SPRINTF The sprintf function has been normalized to php_sprintf via 61364b5bb172fa512c871b795c2613b1b587e4cd. This patch removes the checks to make a custom sprintf function The ZEND_BROKEN_SPRINTF has been removed and the hardcoded #define zend_sprintf sprintf is used. The php_sprintf and zend_sprintf are now symbols to sprintf. This patch now removes the custom PHP definitions of the php_sprintf and zend_sprintf functions in favor of the C99 sprintf which is also standardized in C89 already. Once, on some systems sprintf didn't behave in same way. --- ext/mysqlnd/mysql_float_to_double.h | 2 +- ext/standard/basic_functions.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'ext') diff --git a/ext/mysqlnd/mysql_float_to_double.h b/ext/mysqlnd/mysql_float_to_double.h index dda65017f3..0690a4c498 100644 --- a/ext/mysqlnd/mysql_float_to_double.h +++ b/ext/mysqlnd/mysql_float_to_double.h @@ -42,7 +42,7 @@ static inline double mysql_float_to_double(float fp4, int decimals) { if (decimals < 0) { php_gcvt(fp4, FLT_DIG, '.', 'e', num_buf); } else { - php_sprintf(num_buf, "%.*f", decimals, fp4); + sprintf(num_buf, "%.*f", decimals, fp4); } return zend_strtod(num_buf, NULL); diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 64c40b55e5..646907ba6b 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -123,8 +123,6 @@ typedef struct _user_tick_function_entry { static void user_shutdown_function_dtor(zval *zv); static void user_tick_function_dtor(user_tick_function_entry *tick_function_entry); -#undef sprintf - /* {{{ arginfo */ /* {{{ main/main.c */ ZEND_BEGIN_ARG_INFO(arginfo_set_time_limit, 0) -- cgit v1.2.1