Use zend_sprintf by default (which is defined to sprintf, if the system's

sprintf is useable).

diff --git a/acconfig.h.in b/acconfig.h.in
index 760d55e2a1caedc2c8d59b83851e906a84ef1daf..fba8562865f76bbd0e463272042ee9ff12e466bc 100644 (file)
--- a/acconfig.h.in
+++ b/acconfig.h.in
@@ -113,9 +113,6 @@
 /* Define if you have broken header files like SunOS 4 */
 #define MISSING_FCLOSE_DECL 0
 
-/* Define if you have broken sprintf function like SunOS 4 */
-#define BROKEN_SPRINTF 0
-
 /* Define to compile PHP/Zend thread safe */
 #undef ZTS
 
@@ -124,3 +121,5 @@
 
 /* Define if struct sockaddr contains the field sa_len */
 #undef HAVE_SOCKADDR_SA_LEN
+
+#define sprintf zend_sprintf

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index 49c25a724c1bc30f29dcc7cba1c75f907a59abfe..e3afbfe39acadad61e82ad6fd65eaab55568bda4 100644 (file)
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -100,7 +100,7 @@ static char *_ps_files_path_create(char *buf, size_t buflen, ps_files *data, con
                        (strlen(data->basedir) + 2 * data->dirdepth + keylen + 5 + sizeof(FILE_PREFIX))) 
                return NULL;
        p = key;
-       n = zend_sprintf(buf, "%s/", data->basedir);
+       n = sprintf(buf, "%s/", data->basedir);
        for(i = 0; i < data->dirdepth; i++) {
                buf[n++] = *p++;
                buf[n++] = DIR_DELIMITER;

diff --git a/ext/standard/string.c b/ext/standard/string.c
index f1203cb01ab16cdc717ae1d1490d181f590a5748..1be4980757a58031ced6b7a08e3fbc023fc13d99 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1607,7 +1607,7 @@ PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int should_
                                        case '\v': *target++ = 'v'; break;
                                        case '\b': *target++ = 'b'; break;
                                        case '\f': *target++ = 'f'; break;
-                                       default: target += zend_sprintf(target, "%03o", (unsigned char)c);
+                                       default: target += sprintf(target, "%03o", (unsigned char)c);
                                }
                                continue;
                        }