Add PHP_BROKEN_SPRINTF check here.

Also remove unnecessary #ifdef's for PACKAGE and VERSION.

diff --git a/main/php.h b/main/php.h
index 59fdf6a37009ba0753bf95e2c66094b2af5be800..5af3f98e83feee998dce1b01e64ddb68da042512 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -35,15 +35,15 @@
 #include "php_compat.h"
 
 /* automake defines PACKAGE and VERSION for Zend too */
-#ifdef PACKAGE
-# undef PACKAGE
-#endif
-#ifdef VERSION
-# undef VERSION
-#endif
+#undef PACKAGE
+#undef VERSION
 
 #include "zend_API.h"
 
+#if PHP_BROKEN_SPRINTF
+#undef sprintf
+#define sprintf php_sprintf
+#endif
 
 extern unsigned char first_arg_force_ref[];   
 extern unsigned char first_arg_allow_ref[];