archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

cleanup the mod version macros, round 2

Browse source
This commit is contained in:
Anatol Belski 2015-03-23 20:33:54 +01:00
parent ec89c85054
commit 2d78023244
33 changed files with 57 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/gd/gd.c
View file

@ -1056,7 +1056,7 @@ zend_module_entry gd_module_entry = {
NULL, NULL,
#endif #endif
PHP_MINFO(gd), PHP_MINFO(gd),
NO_VERSION_YET, PHP_GD_VERSION,
STANDARD_MODULE_PROPERTIES STANDARD_MODULE_PROPERTIES
}; };

3
ext/gd/php_gd.h
View file

@ -64,6 +64,9 @@ PHPAPI extern const char php_sig_png[8];
extern zend_module_entry gd_module_entry; extern zend_module_entry gd_module_entry;
#define phpext_gd_ptr &gd_module_entry #define phpext_gd_ptr &gd_module_entry
#include "php_version.h"
#define PHP_GD_VERSION PHP_VERSION
/* gd.c functions */ /* gd.c functions */
PHP_MINFO_FUNCTION(gd); PHP_MINFO_FUNCTION(gd);
PHP_MINIT_FUNCTION(gd); PHP_MINIT_FUNCTION(gd);

2
ext/gettext/gettext.c
View file

@ -127,7 +127,7 @@ zend_module_entry php_gettext_module_entry = {
NULL, NULL,
NULL, NULL,
PHP_MINFO(php_gettext), PHP_MINFO(php_gettext),
NO_VERSION_YET, PHP_GETTEXT_VERSION,
STANDARD_MODULE_PROPERTIES STANDARD_MODULE_PROPERTIES
}; };

3
ext/gettext/php_gettext.h
View file

@ -26,6 +26,9 @@
extern zend_module_entry php_gettext_module_entry; extern zend_module_entry php_gettext_module_entry;
#define gettext_module_ptr &php_gettext_module_entry #define gettext_module_ptr &php_gettext_module_entry
#include "php_version.h"
#define PHP_GETTEXT_VERSION PHP_VERSION
PHP_MINFO_FUNCTION(php_gettext); PHP_MINFO_FUNCTION(php_gettext);
PHP_NAMED_FUNCTION(zif_textdomain); PHP_NAMED_FUNCTION(zif_textdomain);

2
ext/gmp/gmp.c
View file

@ -204,7 +204,7 @@ zend_module_entry gmp_module_entry = {
NULL, NULL,
ZEND_MODULE_DEACTIVATE_N(gmp), ZEND_MODULE_DEACTIVATE_N(gmp),
ZEND_MODULE_INFO_N(gmp), ZEND_MODULE_INFO_N(gmp),
NO_VERSION_YET, PHP_GMP_VERSION,
ZEND_MODULE_GLOBALS(gmp), ZEND_MODULE_GLOBALS(gmp),
ZEND_GINIT(gmp), ZEND_GINIT(gmp),
NULL, NULL,

3
ext/gmp/php_gmp.h
View file

@ -26,6 +26,9 @@
extern zend_module_entry gmp_module_entry; extern zend_module_entry gmp_module_entry;
#define phpext_gmp_ptr &gmp_module_entry #define phpext_gmp_ptr &gmp_module_entry
#include "php_version.h"
#define PHP_GMP_VERSION PHP_VERSION
ZEND_MODULE_STARTUP_D(gmp); ZEND_MODULE_STARTUP_D(gmp);
ZEND_MODULE_DEACTIVATE_D(gmp); ZEND_MODULE_DEACTIVATE_D(gmp);
ZEND_MODULE_INFO_D(gmp); ZEND_MODULE_INFO_D(gmp);

8
ext/hash/hash.c
View file

@ -814,7 +814,7 @@ zend_module_entry mhash_module_entry = {
NULL, NULL,
NULL, NULL,
PHP_MINFO(mhash), PHP_MINFO(mhash),
NO_VERSION_YET, PHP_MHASH_VERSION,
STANDARD_MODULE_PROPERTIES, STANDARD_MODULE_PROPERTIES,
}; };
@ -1271,9 +1271,7 @@ const zend_function_entry hash_functions[] = {
/* {{{ hash_module_entry /* {{{ hash_module_entry
*/ */
zend_module_entry hash_module_entry = { zend_module_entry hash_module_entry = {
#if ZEND_MODULE_API_NO >= 20010901
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
#endif
PHP_HASH_EXTNAME, PHP_HASH_EXTNAME,
hash_functions, hash_functions,
PHP_MINIT(hash), PHP_MINIT(hash),
@ -1281,9 +1279,7 @@ zend_module_entry hash_module_entry = {
NULL, /* RINIT */ NULL, /* RINIT */
NULL, /* RSHUTDOWN */ NULL, /* RSHUTDOWN */
PHP_MINFO(hash), PHP_MINFO(hash),
#if ZEND_MODULE_API_NO >= 20010901 PHP_HASH_VERSION,
PHP_HASH_EXTVER, /* Replace with version number for your extension */
#endif
STANDARD_MODULE_PROPERTIES STANDARD_MODULE_PROPERTIES
}; };
/* }}} */ /* }}} */

3
ext/hash/php_hash.h
View file

@ -24,7 +24,8 @@
#include "php.h" #include "php.h"
#define PHP_HASH_EXTNAME "hash" #define PHP_HASH_EXTNAME "hash"
#define PHP_HASH_EXTVER "1.0" #define PHP_HASH_VERSION "1.0"
#define PHP_MHASH_VERSION "1.0"
#define PHP_HASH_RESNAME "Hash Context" #define PHP_HASH_RESNAME "Hash Context"
#define PHP_HASH_HMAC 0x0001 #define PHP_HASH_HMAC 0x0001

2
ext/iconv/iconv.c
View file

@ -154,7 +154,7 @@ zend_module_entry iconv_module_entry = {
NULL, NULL,
NULL, NULL,
PHP_MINFO(miconv), PHP_MINFO(miconv),
NO_VERSION_YET, PHP_ICONV_VERSION,
PHP_MODULE_GLOBALS(iconv), PHP_MODULE_GLOBALS(iconv),
PHP_GINIT(iconv), PHP_GINIT(iconv),
NULL, NULL,

3
ext/iconv/php_iconv.h
View file

@ -34,6 +34,9 @@
# define PHP_ICONV_API # define PHP_ICONV_API
#endif #endif
#include "php_version.h"
#define PHP_ICONV_VERSION PHP_VERSION
#ifdef PHP_ATOM_INC #ifdef PHP_ATOM_INC
#include "ext/iconv/php_have_iconv.h" #include "ext/iconv/php_have_iconv.h"
#include "ext/iconv/php_have_libiconv.h" #include "ext/iconv/php_have_libiconv.h"

2
ext/imap/php_imap.c
View file

@ -574,7 +574,7 @@ zend_module_entry imap_module_entry = {
PHP_RINIT(imap), PHP_RINIT(imap),
PHP_RSHUTDOWN(imap), PHP_RSHUTDOWN(imap),
PHP_MINFO(imap), PHP_MINFO(imap),
NO_VERSION_YET, PHP_IMAP_VERSION,
PHP_MODULE_GLOBALS(imap), PHP_MODULE_GLOBALS(imap),
PHP_GINIT(imap), PHP_GINIT(imap),
NULL, NULL,

2
ext/imap/php_imap.h
View file

@ -46,6 +46,8 @@
extern zend_module_entry imap_module_entry; extern zend_module_entry imap_module_entry;
#define imap_module_ptr &imap_module_entry #define imap_module_ptr &imap_module_entry
#include "php_version.h"
#define PHP_IMAP_VERSION PHP_VERSION
/* Data types */ /* Data types */

2
ext/interbase/interbase.c
View file

@ -451,7 +451,7 @@ zend_module_entry ibase_module_entry = {
NULL, NULL,
PHP_RSHUTDOWN(ibase), PHP_RSHUTDOWN(ibase),
PHP_MINFO(ibase), PHP_MINFO(ibase),
NO_VERSION_YET, PHP_INTERBASE_VERSION,
PHP_MODULE_GLOBALS(ibase), PHP_MODULE_GLOBALS(ibase),
PHP_GINIT(ibase), PHP_GINIT(ibase),
NULL, NULL,

3
ext/interbase/php_interbase.h
View file

@ -24,6 +24,9 @@
extern zend_module_entry ibase_module_entry; extern zend_module_entry ibase_module_entry;
#define phpext_interbase_ptr &ibase_module_entry #define phpext_interbase_ptr &ibase_module_entry
#include "php_version.h"
#define PHP_INTERBASE_VERSION PHP_VERSION
PHP_MINIT_FUNCTION(ibase); PHP_MINIT_FUNCTION(ibase);
PHP_RINIT_FUNCTION(ibase); PHP_RINIT_FUNCTION(ibase);
PHP_MSHUTDOWN_FUNCTION(ibase); PHP_MSHUTDOWN_FUNCTION(ibase);

2
ext/intl/php_intl.c
View file

@ -874,9 +874,7 @@ static PHP_GINIT_FUNCTION(intl);
/* {{{ intl_module_entry */ /* {{{ intl_module_entry */
zend_module_entry intl_module_entry = { zend_module_entry intl_module_entry = {
#if ZEND_MODULE_API_NO >= 20010901
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
#endif
"intl", "intl",
intl_functions, intl_functions,
PHP_MINIT( intl ), PHP_MINIT( intl ),

2
ext/ldap/ldap.c
View file

@ -3289,7 +3289,7 @@ zend_module_entry ldap_module_entry = { /* {{{ */
NULL, NULL,
NULL, NULL,
PHP_MINFO(ldap), PHP_MINFO(ldap),
NO_VERSION_YET, PHP_LDAP_VERSION,
PHP_MODULE_GLOBALS(ldap), PHP_MODULE_GLOBALS(ldap),
PHP_GINIT(ldap), PHP_GINIT(ldap),
NULL, NULL,

3
ext/ldap/php_ldap.h
View file

@ -32,6 +32,9 @@
extern zend_module_entry ldap_module_entry; extern zend_module_entry ldap_module_entry;
#define ldap_module_ptr &ldap_module_entry #define ldap_module_ptr &ldap_module_entry
#include "php_version.h"
#define PHP_LDAP_VERSION PHP_VERSION
/* LDAP functions */ /* LDAP functions */
PHP_MINIT_FUNCTION(ldap); PHP_MINIT_FUNCTION(ldap);
PHP_MSHUTDOWN_FUNCTION(ldap); PHP_MSHUTDOWN_FUNCTION(ldap);

2
ext/libxml/libxml.c
View file

@ -144,7 +144,7 @@ zend_module_entry libxml_module_entry = {
PHP_RINIT(libxml), /* per-request startup function */ PHP_RINIT(libxml), /* per-request startup function */
PHP_RSHUTDOWN(libxml), /* per-request shutdown function */ PHP_RSHUTDOWN(libxml), /* per-request shutdown function */
PHP_MINFO(libxml), /* information function */ PHP_MINFO(libxml), /* information function */
NO_VERSION_YET, PHP_LIBXML_VERSION,
PHP_MODULE_GLOBALS(libxml), /* globals descriptor */ PHP_MODULE_GLOBALS(libxml), /* globals descriptor */
PHP_GINIT(libxml), /* globals ctor */ PHP_GINIT(libxml), /* globals ctor */
NULL, /* globals dtor */ NULL, /* globals dtor */

3
ext/libxml/php_libxml.h
View file

@ -26,6 +26,9 @@
extern zend_module_entry libxml_module_entry; extern zend_module_entry libxml_module_entry;
#define libxml_module_ptr &libxml_module_entry #define libxml_module_ptr &libxml_module_entry
#include "php_version.h"
#define PHP_LIBXML_VERSION PHP_VERSION
#ifdef PHP_WIN32 #ifdef PHP_WIN32
# define PHP_LIBXML_API __declspec(dllexport) # define PHP_LIBXML_API __declspec(dllexport)
#elif defined(__GNUC__) && __GNUC__ >= 4 #elif defined(__GNUC__) && __GNUC__ >= 4

2
ext/mbstring/mbstring.c
View file

@ -572,7 +572,7 @@ zend_module_entry mbstring_module_entry = {
PHP_RINIT(mbstring), PHP_RINIT(mbstring),
PHP_RSHUTDOWN(mbstring), PHP_RSHUTDOWN(mbstring),
PHP_MINFO(mbstring), PHP_MINFO(mbstring),
NO_VERSION_YET, PHP_MBSTRING_VERSION,
PHP_MODULE_GLOBALS(mbstring), PHP_MODULE_GLOBALS(mbstring),
PHP_GINIT(mbstring), PHP_GINIT(mbstring),
PHP_GSHUTDOWN(mbstring), PHP_GSHUTDOWN(mbstring),

3
ext/mbstring/mbstring.h
View file

@ -51,6 +51,9 @@
#define HAVE_MBSTRING 1 #define HAVE_MBSTRING 1
#endif #endif
#include "php_version.h"
#define PHP_MBSTRING_VERSION PHP_VERSION
#ifdef PHP_WIN32 #ifdef PHP_WIN32
# undef MBSTRING_API # undef MBSTRING_API
# ifdef MBSTRING_EXPORTS # ifdef MBSTRING_EXPORTS

2
ext/mcrypt/mcrypt.c
View file

@ -261,7 +261,7 @@ zend_module_entry mcrypt_module_entry = {
PHP_MINIT(mcrypt), PHP_MSHUTDOWN(mcrypt), PHP_MINIT(mcrypt), PHP_MSHUTDOWN(mcrypt),
NULL, NULL, NULL, NULL,
PHP_MINFO(mcrypt), PHP_MINFO(mcrypt),
NO_VERSION_YET, PHP_MCRYPT_VERSION,
PHP_MODULE_GLOBALS(mcrypt), PHP_MODULE_GLOBALS(mcrypt),
NULL, NULL,
NULL, NULL,

3
ext/mcrypt/php_mcrypt.h
View file

@ -30,6 +30,9 @@
extern zend_module_entry mcrypt_module_entry; extern zend_module_entry mcrypt_module_entry;
#define mcrypt_module_ptr &mcrypt_module_entry #define mcrypt_module_ptr &mcrypt_module_entry
#include "php_version.h"
#define PHP_MCRYPT_VERSION PHP_VERSION
/* Functions for both old and new API */ /* Functions for both old and new API */
PHP_FUNCTION(mcrypt_ecb); PHP_FUNCTION(mcrypt_ecb);
PHP_FUNCTION(mcrypt_cbc); PHP_FUNCTION(mcrypt_cbc);

6
ext/mysqli/mysqli.c
View file

@ -1008,12 +1008,8 @@ static const zend_module_dep mysqli_deps[] = {
/* {{{ mysqli_module_entry /* {{{ mysqli_module_entry
*/ */
zend_module_entry mysqli_module_entry = { zend_module_entry mysqli_module_entry = {
#if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL, STANDARD_MODULE_HEADER_EX, NULL,
mysqli_deps, mysqli_deps,
#elif ZEND_MODULE_API_NO >= 20010901
STANDARD_MODULE_HEADER,
#endif
"mysqli", "mysqli",
mysqli_functions, mysqli_functions,
PHP_MINIT(mysqli), PHP_MINIT(mysqli),
@ -1021,7 +1017,7 @@ zend_module_entry mysqli_module_entry = {
PHP_RINIT(mysqli), PHP_RINIT(mysqli),
PHP_RSHUTDOWN(mysqli), PHP_RSHUTDOWN(mysqli),
PHP_MINFO(mysqli), PHP_MINFO(mysqli),
"0.1", /* Replace with version number for your extension */ PHP_MYSQLI_VERSION,
PHP_MODULE_GLOBALS(mysqli), PHP_MODULE_GLOBALS(mysqli),
PHP_GINIT(mysqli), PHP_GINIT(mysqli),
NULL, NULL,

3
ext/mysqli/php_mysqli.h
View file

@ -26,6 +26,9 @@
#define phpext_mysqli_ptr &mysqli_module_entry #define phpext_mysqli_ptr &mysqli_module_entry
extern zend_module_entry mysqli_module_entry; extern zend_module_entry mysqli_module_entry;
#include "php_version.h"
#define PHP_MYSQLI_VERSION PHP_VERSION
#endif /* PHP_MYSQLI.H */ #endif /* PHP_MYSQLI.H */
/* /*

2
ext/mysqlnd/mysqlnd.c
View file

@ -2053,7 +2053,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, info)(const MYSQLND_CONN_DATA * const conn)
/* {{{ mysqlnd_get_client_info */ /* {{{ mysqlnd_get_client_info */
PHPAPI const char * mysqlnd_get_client_info() PHPAPI const char * mysqlnd_get_client_info()
{ {
return MYSQLND_VERSION; return PHP_MYSQLND_VERSION;
} }
/* }}} */ /* }}} */

2
ext/mysqlnd/mysqlnd.h
View file

@ -22,7 +22,7 @@
#ifndef MYSQLND_H #ifndef MYSQLND_H
#define MYSQLND_H #define MYSQLND_H
#define MYSQLND_VERSION "mysqlnd 5.0.11-dev - 20120503 - $Id$" #define PHP_MYSQLND_VERSION "mysqlnd 5.0.11-dev - 20120503 - $Id$"
#define MYSQLND_VERSION_ID 50011 #define MYSQLND_VERSION_ID 50011
#define MYSQLND_PLUGIN_API_VERSION 2 #define MYSQLND_PLUGIN_API_VERSION 2

6
ext/mysqlnd/mysqlnd_auth.c
View file

@ -394,7 +394,7 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_native_auth_plugin =
MYSQLND_PLUGIN_API_VERSION, MYSQLND_PLUGIN_API_VERSION,
"auth_plugin_mysql_native_password", "auth_plugin_mysql_native_password",
MYSQLND_VERSION_ID, MYSQLND_VERSION_ID,
MYSQLND_VERSION, PHP_MYSQLND_VERSION,
"PHP License 3.01", "PHP License 3.01",
"Andrey Hristov <andrey@mysql.com>, Ulf Wendel <uwendel@mysql.com>, Georg Richter <georg@mysql.com>", "Andrey Hristov <andrey@mysql.com>, Ulf Wendel <uwendel@mysql.com>, Georg Richter <georg@mysql.com>",
{ {
@ -443,7 +443,7 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_pam_authentication_plugin
MYSQLND_PLUGIN_API_VERSION, MYSQLND_PLUGIN_API_VERSION,
"auth_plugin_mysql_clear_password", "auth_plugin_mysql_clear_password",
MYSQLND_VERSION_ID, MYSQLND_VERSION_ID,
MYSQLND_VERSION, PHP_MYSQLND_VERSION,
"PHP License 3.01", "PHP License 3.01",
"Andrey Hristov <andrey@php.net>, Ulf Wendel <uw@php.net>, Georg Richter <georg@php.net>", "Andrey Hristov <andrey@php.net>, Ulf Wendel <uw@php.net>, Georg Richter <georg@php.net>",
{ {
@ -627,7 +627,7 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_sha256_authentication_plu
MYSQLND_PLUGIN_API_VERSION, MYSQLND_PLUGIN_API_VERSION,
"auth_plugin_sha256_password", "auth_plugin_sha256_password",
MYSQLND_VERSION_ID, MYSQLND_VERSION_ID,
MYSQLND_VERSION, PHP_MYSQLND_VERSION,
"PHP License 3.01", "PHP License 3.01",
"Andrey Hristov <andrey@mysql.com>, Ulf Wendel <uwendel@mysql.com>", "Andrey Hristov <andrey@mysql.com>, Ulf Wendel <uwendel@mysql.com>",
{ {

2
ext/mysqlnd/mysqlnd_charset.c
View file

@ -865,7 +865,7 @@ static struct st_mysqlnd_plugin_charsets mysqlnd_plugin_charsets_plugin =
MYSQLND_PLUGIN_API_VERSION, MYSQLND_PLUGIN_API_VERSION,
"charsets", "charsets",
MYSQLND_VERSION_ID, MYSQLND_VERSION_ID,
MYSQLND_VERSION, PHP_MYSQLND_VERSION,
"PHP License 3.01", "PHP License 3.01",
"Andrey Hristov <andrey@mysql.com>, Ulf Wendel <uwendel@mysql.com>, Georg Richter <georg@mysql.com>", "Andrey Hristov <andrey@mysql.com>, Ulf Wendel <uwendel@mysql.com>, Georg Richter <georg@mysql.com>",
{ {

2
ext/mysqlnd/mysqlnd_debug.c
View file

@ -759,7 +759,7 @@ static struct st_mysqlnd_plugin_trace_log mysqlnd_plugin_trace_log_plugin =
MYSQLND_PLUGIN_API_VERSION, MYSQLND_PLUGIN_API_VERSION,
"debug_trace", "debug_trace",
MYSQLND_VERSION_ID, MYSQLND_VERSION_ID,
MYSQLND_VERSION, PHP_MYSQLND_VERSION,
"PHP License 3.01", "PHP License 3.01",
"Andrey Hristov <andrey@mysql.com>, Ulf Wendel <uwendel@mysql.com>, Georg Richter <georg@mysql.com>", "Andrey Hristov <andrey@mysql.com>, Ulf Wendel <uwendel@mysql.com>, Georg Richter <georg@mysql.com>",
{ {

2
ext/mysqlnd/mysqlnd_driver.c
View file

@ -38,7 +38,7 @@ static struct st_mysqlnd_plugin_core mysqlnd_plugin_core =
MYSQLND_PLUGIN_API_VERSION, MYSQLND_PLUGIN_API_VERSION,
"mysqlnd", "mysqlnd",
MYSQLND_VERSION_ID, MYSQLND_VERSION_ID,
MYSQLND_VERSION, PHP_MYSQLND_VERSION,
"PHP License 3.01", "PHP License 3.01",
"Andrey Hristov <andrey@mysql.com>, Ulf Wendel <uwendel@mysql.com>, Georg Richter <georg@mysql.com>", "Andrey Hristov <andrey@mysql.com>, Ulf Wendel <uwendel@mysql.com>, Georg Richter <georg@mysql.com>",
{ {

2
ext/mysqlnd/mysqlnd_libmysql_compat.h
View file

@ -34,7 +34,7 @@
#define my_ulonglong uint64_t #define my_ulonglong uint64_t
#define MYSQL_VERSION_ID MYSQLND_VERSION_ID #define MYSQL_VERSION_ID MYSQLND_VERSION_ID
#define MYSQL_SERVER_VERSION MYSQLND_VERSION #define MYSQL_SERVER_VERSION PHP_MYSQLND_VERSION
#define MYSQL_ERRMSG_SIZE MYSQLND_ERRMSG_SIZE #define MYSQL_ERRMSG_SIZE MYSQLND_ERRMSG_SIZE
#define SQLSTATE_LENGTH MYSQLND_SQLSTATE_LENGTH #define SQLSTATE_LENGTH MYSQLND_SQLSTATE_LENGTH

2
ext/mysqlnd/php_mysqlnd.c
View file

@ -349,7 +349,7 @@ zend_module_entry mysqlnd_module_entry = {
NULL, NULL,
#endif #endif
PHP_MINFO(mysqlnd), PHP_MINFO(mysqlnd),
MYSQLND_VERSION, PHP_MYSQLND_VERSION,
PHP_MODULE_GLOBALS(mysqlnd), PHP_MODULE_GLOBALS(mysqlnd),
PHP_GINIT(mysqlnd), PHP_GINIT(mysqlnd),
NULL, NULL,