cleaning up the version macros

diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index 14586f6cf385a4473c70a34dfb66ebbe2eee5280..5e8ec002bdbf959f78b5737b91819aa31f8074ca 100644 (file)
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -118,7 +118,7 @@ zend_module_entry bcmath_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(bcmath),
-       NO_VERSION_YET,
+       PHP_BCMATH_VERSION,
        PHP_MODULE_GLOBALS(bcmath),
        PHP_GINIT(bcmath),
     PHP_GSHUTDOWN(bcmath),

diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h
index eab199f5fccf3dce1d89810544f049b42969f273..5cb65547aa73645361e047a650cb1f91857e2e1a 100644 (file)
--- a/ext/bcmath/php_bcmath.h
+++ b/ext/bcmath/php_bcmath.h
@@ -26,6 +26,9 @@
 extern zend_module_entry bcmath_module_entry;
 #define phpext_bcmath_ptr &bcmath_module_entry
 
+#include "php_version.h"
+#define PHP_BCMATH_VERSION PHP_VERSION
+
 PHP_MINIT_FUNCTION(bcmath);
 PHP_MSHUTDOWN_FUNCTION(bcmath);
 PHP_MINFO_FUNCTION(bcmath);

diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
index f4d1665d4566b57a45ea289cabc3d71dab4c14f5..921fc9954b158d845eaab25cf5f693677ff0c9f0 100644 (file)
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -120,7 +120,7 @@ zend_module_entry bz2_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(bz2),
-       NO_VERSION_YET,
+       PHP_BZ2_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 

diff --git a/ext/bz2/php_bz2.h b/ext/bz2/php_bz2.h
index b1aa4ca97c314bf4f866b152551ddfc8cacef1bf..d274cbc7511bed133499c13b15e52902b12c7464 100644 (file)
--- a/ext/bz2/php_bz2.h
+++ b/ext/bz2/php_bz2.h
@@ -47,6 +47,9 @@ extern zend_module_entry bz2_module_entry;
 #      define PHP_BZ2_API
 #endif
 
+#include "php_version.h"
+#define PHP_BZ2_VERSION PHP_VERSION
+
 PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, const char *path, const char *mode, int options, zend_string **opened_path, php_stream_context *context STREAMS_DC);
 PHP_BZ2_API php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, const char *mode, php_stream *innerstream STREAMS_DC);
 

diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c
index f84335bd334b1791ef28900ee3314f9b959aaa8a..73a2b3a03dfedb126e7eaf5c1c432e17d0b2b105 100644 (file)
--- a/ext/calendar/calendar.c
+++ b/ext/calendar/calendar.c
@@ -161,7 +161,7 @@ zend_module_entry calendar_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(calendar),
-       NO_VERSION_YET,
+       PHP_CALENDAR_VERSION,
        STANDARD_MODULE_PROPERTIES,
 };
 

diff --git a/ext/calendar/php_calendar.h b/ext/calendar/php_calendar.h
index f574877a812167543762ff4c7f958887887dcdfd..0566ce58c5d2ebc8bb01772976f2c974abee8e4c 100644 (file)
--- a/ext/calendar/php_calendar.h
+++ b/ext/calendar/php_calendar.h
@@ -4,6 +4,9 @@
 extern zend_module_entry calendar_module_entry;
 #define        calendar_module_ptr &calendar_module_entry
 
+#include "php_version.h"
+#define PHP_CALENDAR_VERSION PHP_VERSION
+
 /* Functions */
 
 PHP_MINIT_FUNCTION(calendar);

diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c
index fcd1eff9c55afc7a5c3c12d5470e2e8943728c4a..eeaf75399f08648e8fc26bccf53738a1612e2aaf 100644 (file)
--- a/ext/com_dotnet/com_extension.c
+++ b/ext/com_dotnet/com_extension.c
@@ -244,7 +244,7 @@ zend_module_entry com_dotnet_module_entry = {
        PHP_RINIT(com_dotnet),
        PHP_RSHUTDOWN(com_dotnet),
        PHP_MINFO(com_dotnet),
-       "0.1",
+       PHP_COM_DOTNET_VERSION,
        PHP_MODULE_GLOBALS(com_dotnet),
        PHP_GINIT(com_dotnet),
        NULL,

diff --git a/ext/com_dotnet/php_com_dotnet.h b/ext/com_dotnet/php_com_dotnet.h
index 85ab9b827e83c416678e77064e50401fce5d3a15..8ac6e039b69fdf5dc46af323641b5438d57e0562 100644 (file)
--- a/ext/com_dotnet/php_com_dotnet.h
+++ b/ext/com_dotnet/php_com_dotnet.h
@@ -36,6 +36,9 @@ extern zend_module_entry com_dotnet_module_entry;
 # define PHP_COM_DOTNET_API
 #endif
 
+#include "php_version.h"
+#define PHP_COM_DOTNET_VERSION PHP_VERSION
+
 PHP_MINIT_FUNCTION(com_dotnet);
 PHP_MSHUTDOWN_FUNCTION(com_dotnet);
 PHP_RINIT_FUNCTION(com_dotnet);

diff --git a/ext/ctype/ctype.c b/ext/ctype/ctype.c
index ee4f876a201fde51809ea8bd884ed1761d819517..ba555e2539f7d04aad60437f3b84769adbd63877 100644 (file)
--- a/ext/ctype/ctype.c
+++ b/ext/ctype/ctype.c
@@ -121,7 +121,7 @@ zend_module_entry ctype_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(ctype),
-    NO_VERSION_YET,
+    PHP_CTYPE_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/ctype/php_ctype.h b/ext/ctype/php_ctype.h
index 571dc3027cc62a11fd70d8753305d86c40e1ea9b..b6c6775e87b827a901e605bae5b6d58734da3c9e 100644 (file)
--- a/ext/ctype/php_ctype.h
+++ b/ext/ctype/php_ctype.h
@@ -19,6 +19,9 @@
 #ifndef PHP_CTYPE_H
 #define PHP_CTYPE_H
 
+#include "php_version.h"
+#define PHP_CTYPE_VERSION PHP_VERSION
+
 #if HAVE_CTYPE
 
 extern zend_module_entry ctype_module_entry;

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 85cb33d00a3b081f6780dad1f720408ac8a3bc9c..a51c03f47ffa531c2c255fe89ea245237bb7117a 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -486,7 +486,7 @@ zend_module_entry curl_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(curl),
-       NO_VERSION_YET,
+       PHP_CURL_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h
index bc3db650d9f31c4babbdd5c99dca7ae2f714249c..a1ef16fceaf497522483c8bc7ea005641f05eb52 100644 (file)
--- a/ext/curl/php_curl.h
+++ b/ext/curl/php_curl.h
@@ -42,6 +42,9 @@
 # define PHP_CURL_API
 #endif
 
+#include "php_version.h"
+#define PHP_CURL_VERSION PHP_VERSION
+
 #include <curl/curl.h>
 #include <curl/multi.h>
 

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index bc423d26636cadb366eee4d32647b4c2e871d779..40e471bc94348e8a77e6aedbbf2cb9f20b38b12e 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -667,7 +667,7 @@ zend_module_entry date_module_entry = {
        PHP_RINIT(date),            /* request startup */
        PHP_RSHUTDOWN(date),        /* request shutdown */
        PHP_MINFO(date),            /* extension info */
-       PHP_VERSION,                /* extension version */
+       PHP_DATE_VERSION,                /* extension version */
        PHP_MODULE_GLOBALS(date),   /* globals descriptor */
        PHP_GINIT(date),            /* globals ctor */
        NULL,                       /* globals dtor */

diff --git a/ext/date/php_date.h b/ext/date/php_date.h
index a423eab2d8d7cdf50ed9b1b0b8edc40ed53940d5..8492a41e774c1b3b996bf3c86fd740d07b183195 100644 (file)
--- a/ext/date/php_date.h
+++ b/ext/date/php_date.h
@@ -24,6 +24,9 @@
 #include "lib/timelib.h"
 #include "Zend/zend_hash.h"
 
+#include "php_version.h"
+#define PHP_DATE_VERSION PHP_VERSION
+
 extern zend_module_entry date_module_entry;
 #define phpext_date_ptr &date_module_entry
 

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index d45ec96415c10a8e8a9569a35ae82dc743f98ab8..70e2f213c8e16bf33e244aa2c3307161dac69211 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -178,7 +178,7 @@ zend_module_entry dba_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(dba),
-       NO_VERSION_YET,
+       PHP_DBA_VERSION,
        PHP_MODULE_GLOBALS(dba),
        PHP_GINIT(dba),
        NULL,

diff --git a/ext/dba/php_dba.h b/ext/dba/php_dba.h
index 13dd3ab55f113f32fa1abe691ab76c73eca407b0..aef4ceae7d7a62a907079a3a20582843821de26b 100644 (file)
--- a/ext/dba/php_dba.h
+++ b/ext/dba/php_dba.h
@@ -21,6 +21,9 @@
 #ifndef PHP_DBA_H
 #define PHP_DBA_H
 
+#include "php_version.h"
+#define PHP_DBA_VERSION PHP_VERSION
+
 #if HAVE_DBA
 
 typedef enum {

diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
index 298f3555919f3879bf4799352e31af4867c6674c..15ec453a59d08b3e24e6bb95097cb75b0a238be1 100644 (file)
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
@@ -151,9 +151,7 @@ zend_function_entry enchant_functions[] = {
 /* {{{ enchant_module_entry
  */
 zend_module_entry enchant_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
        STANDARD_MODULE_HEADER,
-#endif
        "enchant",
        enchant_functions,
        PHP_MINIT(enchant),
@@ -161,9 +159,7 @@ zend_module_entry enchant_module_entry = {
        NULL,   /* Replace with NULL if there's nothing to do at request start */
        NULL,   /* Replace with NULL if there's nothing to do at request end */
        PHP_MINFO(enchant),
-#if ZEND_MODULE_API_NO >= 20010901
        PHP_ENCHANT_VERSION,
-#endif
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 8bdc0c8f27c2c9dd1f7551f1f9fe3ab57a06a4b1..e06308764f5a253a0e1b87e65bf5491cbadcee7d 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -128,15 +128,13 @@ const zend_function_entry exif_functions[] = {
 };
 /* }}} */
 
-#define EXIF_VERSION "1.4 $Id$"
-
 /* {{{ PHP_MINFO_FUNCTION
  */
 PHP_MINFO_FUNCTION(exif)
 {
        php_info_print_table_start();
        php_info_print_table_row(2, "EXIF Support", "enabled");
-       php_info_print_table_row(2, "EXIF Version", EXIF_VERSION);
+       php_info_print_table_row(2, "EXIF Version", PHP_EXIF_VERSION);
        php_info_print_table_row(2, "Supported EXIF Version", "0220");
        php_info_print_table_row(2, "Supported filetypes", "JPEG,TIFF");
        php_info_print_table_end();
@@ -265,18 +263,12 @@ zend_module_entry exif_module_entry = {
        PHP_MSHUTDOWN(exif),
        NULL, NULL,
        PHP_MINFO(exif),
-#if ZEND_MODULE_API_NO >= 20010901
-       EXIF_VERSION,
-#endif
-#if ZEND_MODULE_API_NO >= 20060613
+       PHP_EXIF_VERSION,
        PHP_MODULE_GLOBALS(exif),
        PHP_GINIT(exif),
        NULL,
        NULL,
        STANDARD_MODULE_PROPERTIES_EX
-#else
-       STANDARD_MODULE_PROPERTIES
-#endif
 };
 /* }}} */
 

diff --git a/ext/exif/php_exif.h b/ext/exif/php_exif.h
index 87f2d93280b8b8b9e5207f7d28a0b1a433d8b8ff..ed4c066e152d1b3377eb4acbabf75753f1bfe147 100644 (file)
--- a/ext/exif/php_exif.h
+++ b/ext/exif/php_exif.h
@@ -20,6 +20,10 @@
 /* $Id$ */
 
 #if HAVE_EXIF
+
+#include "php_version.h"
+#define PHP_EXIF_VERSION "1.4 $Id: 8bdc0c8f27c2c9dd1f7551f1f9fe3ab57a06a4b1 $"
+
 extern zend_module_entry exif_module_entry;
 #define phpext_exif_ptr &exif_module_entry
 

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 475cfccb2edd1185b867191c8d291e25b46de6e8..67f190eda592b21e42875ee6a21799485b2c3b3a 100644 (file)
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -137,9 +137,7 @@ static const zend_function_entry filter_functions[] = {
 /* {{{ filter_module_entry
  */
 zend_module_entry filter_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
        STANDARD_MODULE_HEADER,
-#endif
        "filter",
        filter_functions,
        PHP_MINIT(filter),
@@ -147,7 +145,7 @@ zend_module_entry filter_module_entry = {
        NULL,
        PHP_RSHUTDOWN(filter),
        PHP_MINFO(filter),
-       "0.11.0",
+       PHP_FILTER_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/filter/php_filter.h b/ext/filter/php_filter.h
index 87f469bafe4a3f69e97484a839b4e12739dd54cd..301b7aab3a034bf2533473984dc2564e2027a1c6 100644 (file)
--- a/ext/filter/php_filter.h
+++ b/ext/filter/php_filter.h
@@ -38,6 +38,9 @@ extern zend_module_entry filter_module_entry;
 #include "TSRM.h"
 #endif
 
+#include "php_version.h"
+#define PHP_FILTER_VERSION "0.11.0"
+
 PHP_MINIT_FUNCTION(filter);
 PHP_MSHUTDOWN_FUNCTION(filter);
 PHP_RINIT_FUNCTION(filter);

diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index 2701891cfc374541e97d20d5306523b9fd162d35..eaed5c6847ad5c80a221e142b32ea10aceeaeeb3 100644 (file)
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -292,7 +292,7 @@ zend_module_entry php_ftp_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(ftp),
-       NO_VERSION_YET,
+       PHP_FTP_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 

diff --git a/ext/ftp/php_ftp.h b/ext/ftp/php_ftp.h
index 054ec508ed6e8f479eece5eada540289acdeac24..3ddc76f074d894879e2b719b0be062fb106f38a1 100644 (file)
--- a/ext/ftp/php_ftp.h
+++ b/ext/ftp/php_ftp.h
@@ -27,6 +27,9 @@
 extern zend_module_entry php_ftp_module_entry;
 #define php_ftp_module_ptr &php_ftp_module_entry
 
+#include "php_version.h"
+#define PHP_FTP_VERSION PHP_VERSION
+
 #define PHP_FTP_OPT_TIMEOUT_SEC        0
 #define PHP_FTP_OPT_AUTOSEEK   1
 #define PHP_FTP_AUTORESUME             -1