cleanup mod version macros, round 3

This commit is contained in:
Anatol Belski 2015-03-23 20:54:55 +01:00
parent 2d78023244
commit 19360f386e
26 changed files with 52 additions and 35 deletions

View File

@ -148,7 +148,7 @@ zend_module_entry birdstep_module_entry = {
PHP_RINIT(birdstep),
NULL,
PHP_MINFO(birdstep),
NO_VERSION_YET,
PHP_BIRDSTEP_VERSION,
STANDARD_MODULE_PROPERTIES
};

View File

@ -26,6 +26,9 @@
#include <sql.h>
#include <sqlext.h>
#include "php_version.h"
#define PHP_BIRDSTEP_VERSION PHP_VERSION
typedef struct VConn {
HDBC hdbc;
zend_long index;

View File

@ -401,7 +401,7 @@ zend_module_entry odbc_module_entry = {
PHP_RINIT(odbc),
PHP_RSHUTDOWN(odbc),
PHP_MINFO(odbc),
"1.0",
PHP_ODBC_VERSION,
PHP_MODULE_GLOBALS(odbc),
PHP_GINIT(odbc),
NULL,

View File

@ -32,6 +32,9 @@
extern zend_module_entry odbc_module_entry;
#define odbc_module_ptr &odbc_module_entry
#include "php_version.h"
#define PHP_ODBC_VERSION PHP_VERSION
#if defined(HAVE_DBMAKER) || defined(PHP_WIN32) || defined(HAVE_IBMDB2) || defined(HAVE_UNIXODBC) || defined(HAVE_BIRDSTEP) || defined(HAVE_IODBC)
# define PHP_ODBC_HAVE_FETCH_HASH 1
#endif

View File

@ -525,7 +525,7 @@ zend_module_entry openssl_module_entry = {
NULL,
NULL,
PHP_MINFO(openssl),
NO_VERSION_YET,
PHP_OPENSSL_VERSION,
STANDARD_MODULE_PROPERTIES
};
/* }}} */

View File

@ -26,6 +26,9 @@
extern zend_module_entry openssl_module_entry;
#define phpext_openssl_ptr &openssl_module_entry
#include "php_version.h"
#define PHP_OPENSSL_VERSION PHP_VERSION
#define OPENSSL_RAW_DATA 1
#define OPENSSL_ZERO_PADDING 2

View File

@ -193,7 +193,7 @@ zend_module_entry pcntl_module_entry = {
PHP_RINIT(pcntl),
PHP_RSHUTDOWN(pcntl),
PHP_MINFO(pcntl),
NO_VERSION_YET,
PHP_PCNTL_VERSION,
PHP_MODULE_GLOBALS(pcntl),
PHP_GINIT(pcntl),
NULL,

View File

@ -26,6 +26,9 @@
extern zend_module_entry pcntl_module_entry;
#define phpext_pcntl_ptr &pcntl_module_entry
#include "php_version.h"
#define PHP_PCNTL_VERSION PHP_VERSION
PHP_MINIT_FUNCTION(pcntl);
PHP_MSHUTDOWN_FUNCTION(pcntl);
PHP_RINIT_FUNCTION(pcntl);

View File

@ -2127,7 +2127,7 @@ zend_module_entry pcre_module_entry = {
NULL,
NULL,
PHP_MINFO(pcre),
NO_VERSION_YET,
PHP_PCRE_VERSION,
PHP_MODULE_GLOBALS(pcre),
PHP_GINIT(pcre),
PHP_GSHUTDOWN(pcre),

View File

@ -40,6 +40,9 @@ PHPAPI pcre* pcre_get_compiled_regex_ex(zend_string *regex, pcre_extra **extra,
extern zend_module_entry pcre_module_entry;
#define pcre_module_ptr &pcre_module_entry
#include "php_version.h"
#define PHP_PCRE_VERSION PHP_VERSION
typedef struct {
pcre *re;
pcre_extra *extra;

View File

@ -140,12 +140,8 @@ static const zend_module_dep pdo_deps[] = {
/* {{{ pdo_module_entry */
zend_module_entry pdo_module_entry = {
#if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL,
pdo_deps,
#else
STANDARD_MODULE_HEADER,
#endif
"PDO",
pdo_functions,
PHP_MINIT(pdo),
@ -153,7 +149,7 @@ zend_module_entry pdo_module_entry = {
NULL,
NULL,
PHP_MINFO(pdo),
"1.0.4dev",
PHP_PDO_VERSION,
PHP_MODULE_GLOBALS(pdo),
PHP_GINIT(pdo),
NULL,

View File

@ -26,6 +26,9 @@
extern zend_module_entry pdo_module_entry;
#define phpext_pdo_ptr &pdo_module_entry
#include "php_version.h"
#define PHP_PDO_VERSION PHP_VERSION
#ifdef PHP_WIN32
# if defined(PDO_EXPORTS) || (!defined(COMPILE_DL_PDO))
# define PDO_API __declspec(dllexport)

View File

@ -70,7 +70,7 @@ zend_module_entry pdo_dblib_module_entry = {
NULL,
PHP_RSHUTDOWN(pdo_dblib),
PHP_MINFO(pdo_dblib),
"1.0.1",
PHP_PDO_DBLIB_VERSION,
PHP_MODULE_GLOBALS(dblib),
PHP_GINIT(dblib),
NULL,

View File

@ -30,6 +30,9 @@ extern zend_module_entry pdo_dblib_module_entry;
#define phpext_pdo_dblib_ptr &pdo_dblib_module_entry
#endif
#include "php_version.h"
#define PHP_PDO_DBLIB_VERSION PHP_VERSION
#ifdef ZTS
# include "TSRM.h"
#endif

View File

@ -51,7 +51,7 @@ zend_module_entry pdo_firebird_module_entry = { /* {{{ */
NULL,
NULL,
PHP_MINFO(pdo_firebird),
"0.3",
PHP_PDO_FIREBIRD_VERSION,
STANDARD_MODULE_PROPERTIES
};
/* }}} */

View File

@ -22,6 +22,9 @@
extern zend_module_entry pdo_firebird_module_entry;
#define phpext_pdo_firebird_ptr &pdo_firebird_module_entry
#include "php_version.h"
#define PHP_PDO_FIREBIRD_VERSION PHP_VERSION
#ifdef ZTS
#include "TSRM.h"
#endif

View File

@ -256,7 +256,7 @@ zend_module_entry pdo_mysql_module_entry = {
NULL,
#endif
PHP_MINFO(pdo_mysql),
"1.0.2",
PHP_PDO_MYSQL_VERSION,
PHP_MODULE_GLOBALS(pdo_mysql),
PHP_GINIT(pdo_mysql),
NULL,

View File

@ -24,6 +24,9 @@
extern zend_module_entry pdo_mysql_module_entry;
#define phpext_pdo_mysql_ptr &pdo_mysql_module_entry
#include "php_version.h"
#define PHP_PDO_MYSQL_VERSION PHP_VERSION
#ifdef PHP_WIN32
#define PHP_PDO_MYSQL_API __declspec(dllexport)
#else

View File

@ -46,12 +46,8 @@ static const zend_module_dep pdo_oci_deps[] = {
#endif
zend_module_entry pdo_oci_module_entry = {
#if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL,
pdo_oci_deps,
#else
STANDARD_MODULE_HEADER,
#endif
"PDO_OCI",
pdo_oci_functions,
PHP_MINIT(pdo_oci),
@ -59,7 +55,7 @@ zend_module_entry pdo_oci_module_entry = {
NULL,
NULL,
PHP_MINFO(pdo_oci),
"1.0.1",
PHP_PDO_OCI_VERSION,
STANDARD_MODULE_PROPERTIES
};
/* }}} */

View File

@ -24,6 +24,9 @@
extern zend_module_entry pdo_oci_module_entry;
#define phpext_pdo_oci_ptr &pdo_oci_module_entry
#include "php_version.h"
#define PHP_PDO_OCI_VERSION PHP_VERSION
#ifdef ZTS
#include "TSRM.h"
#endif

View File

@ -47,12 +47,8 @@ static const zend_module_dep pdo_odbc_deps[] = {
/* {{{ pdo_odbc_module_entry */
zend_module_entry pdo_odbc_module_entry = {
#if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL,
pdo_odbc_deps,
#else
STANDARD_MODULE_HEADER,
#endif
"PDO_ODBC",
pdo_odbc_functions,
PHP_MINIT(pdo_odbc),
@ -60,7 +56,7 @@ zend_module_entry pdo_odbc_module_entry = {
NULL,
NULL,
PHP_MINFO(pdo_odbc),
"1.0.1",
PHP_PDO_ODBC_VERSION,
STANDARD_MODULE_PROPERTIES
};
/* }}} */

View File

@ -24,6 +24,9 @@
extern zend_module_entry pdo_odbc_module_entry;
#define phpext_pdo_odbc_ptr &pdo_odbc_module_entry
#include "php_version.h"
#define PHP_PDO_ODBC_VERSION PHP_VERSION
#ifdef ZTS
#include "TSRM.h"
#endif

View File

@ -57,12 +57,8 @@ static const zend_module_dep pdo_pgsql_deps[] = {
/* {{{ pdo_pgsql_module_entry */
zend_module_entry pdo_pgsql_module_entry = {
#if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL,
pdo_pgsql_deps,
#else
STANDARD_MODULE_HEADER,
#endif
"pdo_pgsql",
pdo_pgsql_functions,
PHP_MINIT(pdo_pgsql),
@ -70,7 +66,7 @@ zend_module_entry pdo_pgsql_module_entry = {
NULL,
NULL,
PHP_MINFO(pdo_pgsql),
"1.0.2",
PHP_PDO_PGSQL_VERSION,
STANDARD_MODULE_PROPERTIES
};
/* }}} */

View File

@ -26,6 +26,9 @@
extern zend_module_entry pdo_pgsql_module_entry;
#define phpext_pdo_pgsql_ptr &pdo_pgsql_module_entry
#include "php_version.h"
#define PHP_PDO_PGSQL_VERSION PHP_VERSION
#ifdef ZTS
#include "TSRM.h"
#endif

View File

@ -31,8 +31,6 @@
#include "php_pdo_sqlite_int.h"
#include "zend_exceptions.h"
#define PHP_PDO_SQLITE_MODULE_VERSION "1.0.1"
/* {{{ pdo_sqlite_functions[] */
const zend_function_entry pdo_sqlite_functions[] = {
PHP_FE_END
@ -52,12 +50,8 @@ static const zend_module_dep pdo_sqlite_deps[] = {
/* {{{ pdo_sqlite_module_entry
*/
zend_module_entry pdo_sqlite_module_entry = {
#if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL,
pdo_sqlite_deps,
#else
STANDARD_MODULE_HEADER,
#endif
"pdo_sqlite",
pdo_sqlite_functions,
PHP_MINIT(pdo_sqlite),
@ -65,7 +59,7 @@ zend_module_entry pdo_sqlite_module_entry = {
NULL,
NULL,
PHP_MINFO(pdo_sqlite),
PHP_PDO_SQLITE_MODULE_VERSION,
PHP_PDO_SQLITE_VERSION,
STANDARD_MODULE_PROPERTIES
};
/* }}} */

View File

@ -25,6 +25,9 @@
extern zend_module_entry pdo_sqlite_module_entry;
#define phpext_pdo_sqlite_ptr &pdo_sqlite_module_entry
#include "php_version.h"
#define PHP_PDO_SQLITE_VERSION PHP_VERSION
#ifdef ZTS
#include "TSRM.h"
#endif