summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/main.c1
-rw-r--r--main/php.h7
2 files changed, 2 insertions, 6 deletions
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