Fix build on systems which lack snprintf or vsnprintf.

PR: #3786

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 */

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

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))

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>

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"

ext/standard/math.c

@@ -23,7 +23,6 @@
 
 #include "php.h"
 #include "phpmath.h"
-#include "snprintf.h"
 
 #include <math.h>
 

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

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>

ext/standard/url_scanner.c

@@ -20,7 +20,6 @@
 /* $Id$ */
 
 #include "php.h"
-#include "snprintf.h"
 
 #ifdef TRANS_SID
 

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:

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

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>

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

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>

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>