Merge changes from HEAD

diff --git a/configure.in b/configure.in
index e6a42471353347e1927b448cb176cc523908a4b5..f555c466701268804ba6c53a785584bb23659d41 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -51,7 +51,7 @@ dnl ## All of these are normally in the extension directories.
 dnl ## Diversion 5 is the last one.  Here we generate files and clean up.
 
 dnl ## This is where the version number is changed from now on!
-AM_INIT_AUTOMAKE(php, 4.0.4RC3)
+AM_INIT_AUTOMAKE(php, 4.0.4RC3, nodefine)
 
 PHP_VERSION=$VERSION
 echo "/* automatically generated by configure */" > php_version.h.new

diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c
index 0ac6fe4a242d3f542645f75ec6376e452755865a..adb9854efdb2190f93b5ed766accb6b10bd13288 100644 (file)
--- a/ext/shmop/shmop.c
+++ b/ext/shmop/shmop.c
@@ -25,6 +25,8 @@
 
 #if HAVE_SHMOP
 
+#include "ext/standard/info.h"
+
 #ifdef ZTS
 int shmop_globals_id;
 #else

diff --git a/main/php.h b/main/php.h
index 5b30e5909b5818b500a3e03d41cd4b4546aa9496..76acd56cb22ca29abdccaf88501b862e93bd1b8f 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -34,10 +34,6 @@
 #include "zend.h"
 #include "php_compat.h"
 
-/* automake defines PACKAGE and VERSION for Zend too */
-#undef PACKAGE
-#undef VERSION
-
 #include "zend_API.h"
 
 #if PHP_BROKEN_SPRINTF