diff options
| author | Sascha Schumann <sas@php.net> | 2000-12-02 13:46:08 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-12-02 13:46:08 +0000 |
| commit | 44294ada47d64f1648ed951ef4ac2bdb1980ae6b (patch) | |
| tree | e93f82af8cade2dada0e75b5e1a41ed68f230a99 | |
| parent | c277e3f98dab989279d2f6ea72068e0bdc884ac5 (diff) | |
| download | php-git-44294ada47d64f1648ed951ef4ac2bdb1980ae6b.tar.gz | |
Merge changes from HEAD
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | ext/shmop/shmop.c | 2 | ||||
| -rw-r--r-- | main/php.h | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/configure.in b/configure.in index e6a4247135..f555c46670 100644 --- 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 0ac6fe4a24..adb9854efd 100644 --- 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 5b30e5909b..76acd56cb2 100644 --- 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 |