Fix build on systems which lack snprintf or vsnprintf.

PR: #3786

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 17587cdb6774db3ebabdff10529f954758233bad..699c560b178232e7fbb4ff5c76d814ae693d8965 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -83,7 +83,6 @@ static zend_class_entry *oci_lob_class_entry_ptr;
 
 #include <fcntl.h>
 
-#include "snprintf.h"
 
 /* }}} */
 /* {{{ thread safety stuff */

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index b0996c8ec57bfc9171727bf2880f97f93fa68540..e9ee39a35e4966b492c7421b1db02cd7c5437060 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -40,7 +40,6 @@
 
 #include <fcntl.h>
 #include "ext/standard/head.h"
-#include "snprintf.h"
 #include "php_ini.h"
 
 #if WIN32|WINNT

diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c
index b9993f75651e5e687e4195a03e6d049d786637fa..9cd96c69383f6fe46dc12f9e4fab0d0baa3918bc 100644 (file)
--- a/ext/oracle/oracle.c
+++ b/ext/oracle/oracle.c
@@ -44,7 +44,6 @@
 # include "build-defs.h"
 #endif
 
-#include "snprintf.h"
 
 #ifndef min
 #define min(a, b) ((a) > (b) ? (b) : (a))

diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 29ea203580c26f6d3c058ea60bbcabf6f10ad41e..f40e3d2fdc2cda26ee9cfec1d1a3de23bb56fd46 100644 (file)
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -25,7 +25,6 @@
 #include "php.h"
 #include "zend_operators.h"
 #include "datetime.h"
-#include "snprintf.h"
 #include "php_globals.h"
 
 #include <time.h>

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 9eb8f2564e5302558d0469ba002b700cd60de707..852170e4645290445c0baefa8e5d1d2d573f459d 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -65,7 +65,6 @@
 #include <netdb.h>
 #include <arpa/inet.h>
 #endif
-#include "snprintf.h"
 #include "fsock.h"
 #include "fopen-wrappers.h"
 #include "php_globals.h"

diff --git a/ext/standard/math.c b/ext/standard/math.c
index bfaa155d1c39ad2c7f7ad87278a3a99551f24bd7..19b87e733c1e980e0d8b6a8a432b0292a12ba1cb 100644 (file)
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -23,7 +23,6 @@
 
 #include "php.h"
 #include "phpmath.h"
-#include "snprintf.h"
 
 #include <math.h>
 

diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c
index e0746d8e3d2f0b48f9249236f3dee6e0a331849d..ad0e32851077f49e772e3bc01e720c34224c4dc2 100644 (file)
--- a/ext/standard/microtime.c
+++ b/ext/standard/microtime.c
@@ -40,7 +40,6 @@
 #include <errno.h>
 
 #include "microtime.h"
-#include "snprintf.h"
 
 #define NUL  '\0'
 #define MICRO_IN_SEC 1000000.00

diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 5ff9f29312669644d15595e185df4c9d5d4e1c88..2fd20fd510476232b9344a7c1c4d4338516dbc28 100644 (file)
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -44,7 +44,6 @@
 #include <pwd.h>
 #endif
 #endif
-#include "snprintf.h"
 #include "fsock.h"
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/ext/standard/url_scanner.c b/ext/standard/url_scanner.c
index 7da384a2909bbab66b404e7d58edd10cee135d34..7f176f441e0ba29f9243c831a20788283cce6d9a 100644 (file)
--- a/ext/standard/url_scanner.c
+++ b/ext/standard/url_scanner.c
@@ -20,7 +20,6 @@
 /* $Id$ */
 
 #include "php.h"
-#include "snprintf.h"
 
 #ifdef TRANS_SID
 

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 4579f8476c44ea45e57d9fe224b352e873f2a060..a49c718e4f1a685eb4eafc4e2095a7588e74933b 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -32,7 +32,6 @@
 # if !(WIN32|WINNT)
 #  include "build-defs.h"
 # endif
-# include "snprintf.h"
 # include "ext/standard/head.h"
 
 /* Short-term TODO list:

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 82df509e90921c7baa534be6df301aad21ea3d3c..52440e749cd7e0bda410e8585b4966d836674c12 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -48,7 +48,6 @@
 #include <pwd.h>
 #endif
 #endif
-#include "snprintf.h"
 #if HAVE_ZLIB
 #if defined(HAVE_UNISTD_H) && defined(PHP_WIN32)
 #undef HAVE_UNISTD_H

diff --git a/main/main.c b/main/main.c
index a96f3088dad909f4d59c21e7b722021e5dba5a16..7a4ad01819569da06647ec8a71c4d26cccca79c1 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -49,7 +49,6 @@
 #include "main.h"
 #include "fopen-wrappers.h"
 #include "ext/standard/php_standard.h"
-#include "snprintf.h"
 #include "php_variables.h"
 #ifdef PHP_WIN32
 #include <io.h>

diff --git a/main/php.h b/main/php.h
index cb332f28f4eaa13afbeecd4a0b7ae9fe19c0738a..be87eb1a5ec2b917f1ada3c78b75522a7a3a7926 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -188,11 +188,8 @@ extern char *strerror(int);
 #define LONG_MIN (- LONG_MAX - 1)
 #endif
 
-#if (!HAVE_SNPRINTF)
-#define snprintf ap_snprintf
-#define vsnprintf ap_vsnprintf
-extern int ap_snprintf(char *, size_t, const char *, ...);
-extern int ap_vsnprintf(char *, size_t, const char *, va_list);
+#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)
+#include "snprintf.h"
 #endif
 
 #define EXEC_INPUT_BUF 4096

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 3b44e4d1e7ce047ef4c02f38f9cb850ff8e7e2f2..6d7aa8eb7d026173677e447dcec3519645b687b2 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -52,7 +52,6 @@
 #include "main.h"
 #include "fopen-wrappers.h"
 #include "ext/standard/php_standard.h"
-#include "snprintf.h"
 #if WIN32|WINNT
 #include <io.h>
 #include <fcntl.h>

diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index b37d8bce397c2257cc95a6c8d0996bf9676b0b37..a7e35ef31d1719d34c6ac8aac6117b33206f83a2 100644 (file)
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -52,7 +52,6 @@
 #include "fopen-wrappers.h"
 #include "ext/standard/php_standard.h"
 #include "ext/standard/php_dir.h"
-#include "snprintf.h"
 #if WIN32|WINNT
 #include <io.h>
 #include <fcntl.h>