- Made PHP_VERSION and PHP_OS work again

- More php3_ cleanup
@- Restored the PHP_VERSION and PHP_OS constants (Zeev)

Author: zsuraski

ext/apache/apache.c

@@ -113,7 +113,7 @@ static PHP_MSHUTDOWN_FUNCTION(apache)
 }
 
 
-php3_module_entry apache_module_entry = {
+zend_module_entry apache_module_entry = {
 	"Apache", apache_functions, PHP_MINIT(apache), PHP_MSHUTDOWN(apache), NULL, NULL, PHP_MINFO(apache), STANDARD_MODULE_PROPERTIES
 };
 

ext/aspell/aspell.c

@@ -46,13 +46,13 @@ function_entry aspell_functions[] = {
 
 static int le_aspell;
 
-php3_module_entry aspell_module_entry = {
+zend_module_entry aspell_module_entry = {
 	"Aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), STANDARD_MODULE_PROPERTIES
 };
 
 
 #if COMPILE_DL
-DLEXPORT php3_module_entry *get_module(void) { return &aspell_module_entry; }
+DLEXPORT zend_module_entry *get_module(void) { return &aspell_module_entry; }
 #endif
 
 PHP_MINIT_FUNCTION(aspell)

ext/aspell/php_aspell.h

@@ -33,7 +33,7 @@
 #ifndef _ASPELL_H
 #define _ASPELL_H
 #if HAVE_ASPELL
-extern php3_module_entry aspell_module_entry;
+extern zend_module_entry aspell_module_entry;
 #define aspell_module_ptr &aspell_module_entry
 
 extern PHP_MINIT_FUNCTION(aspell);

ext/bcmath/bcmath.c

@@ -36,12 +36,12 @@ function_entry bcmath_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-php3_module_entry bcmath_module_entry = {
+zend_module_entry bcmath_module_entry = {
 	"bcmath", bcmath_functions, NULL, NULL, PHP_RINIT(bcmath), PHP_RSHUTDOWN(bcmath), NULL, STANDARD_MODULE_PROPERTIES
 };
 
 #if COMPILE_DL
-php3_module_entry *get_module() { return &bcmath_module_entry; };
+zend_module_entry *get_module() { return &bcmath_module_entry; };
 #endif
 
 #ifndef THREAD_SAFE

ext/bcmath/php_bcmath.h

@@ -40,7 +40,7 @@
 
 #if WITH_BCMATH
 
-extern php3_module_entry bcmath_module_entry;
+extern zend_module_entry bcmath_module_entry;
 #define phpext_bcmath_ptr &bcmath_module_entry
 
 extern PHP_RINIT_FUNCTION(bcmath);