15 files changed, 2 insertions, 19 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 17587cdb67..699c560b17 100644
--- 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 b0996c8ec5..e9ee39a35e 100644
--- 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 b9993f7565..9cd96c6938 100644
--- 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 29ea203580..f40e3d2fdc 100644
--- 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 9eb8f2564e..852170e464 100644
--- 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 bfaa155d1c..19b87e733c 100644
--- 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 e0746d8e3d..ad0e328510 100644
--- 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 5ff9f29312..2fd20fd510 100644
--- 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 7da384a290..7f176f441e 100644
--- 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 4579f8476c..a49c718e4f 100644
--- 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 82df509e90..52440e749c 100644
--- 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 a96f3088da..7a4ad01819 100644
--- 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 cb332f28f4..be87eb1a5e 100644
--- 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 3b44e4d1e7..6d7aa8eb7d 100644
--- 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 b37d8bce39..a7e35ef31d 100644
--- 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>