diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-06-22 17:33:22 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-06-22 17:33:22 +0200 |
| commit | 5e23a047acf7b27fff20381d460fcd699731e9a5 (patch) | |
| tree | 52c37f399d35b99db5e3abfb1e4a0dfb1c063092 | |
| parent | 4af92aca872d7463b671c037f9d3b782e22a7c9c (diff) | |
| parent | a62d4e2c43a41a2864e9b38836170e2d4f34033f (diff) | |
| download | php-git-5e23a047acf7b27fff20381d460fcd699731e9a5.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Remove extra ;
| -rw-r--r-- | ext/odbc/php_odbc.c | 2 | ||||
| -rwxr-xr-x | ext/pdo_mysql/pdo_mysql.c | 2 | ||||
| -rw-r--r-- | ext/recode/recode.c | 2 | ||||
| -rw-r--r-- | ext/session/session.c | 2 | ||||
| -rw-r--r-- | ext/standard/browscap.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index e98d863be9..52d46b2fd0 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -387,7 +387,7 @@ const zend_function_entry odbc_functions[] = { }; /* }}} */ -ZEND_DECLARE_MODULE_GLOBALS(odbc); +ZEND_DECLARE_MODULE_GLOBALS(odbc) static PHP_GINIT_FUNCTION(odbc); /* {{{ odbc_module_entry diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index 5118406e9e..ea69c3c11b 100755 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -35,7 +35,7 @@ ZEND_GET_MODULE(pdo_mysql) #endif -ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql); +ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql) /* The default socket location is sometimes defined by configure. diff --git a/ext/recode/recode.c b/ext/recode/recode.c index e17429b238..a1a74deff3 100644 --- a/ext/recode/recode.c +++ b/ext/recode/recode.c @@ -63,7 +63,7 @@ ZEND_END_MODULE_GLOBALS(recode) # define ReSG(v) (recode_globals.v) #endif -ZEND_DECLARE_MODULE_GLOBALS(recode); +ZEND_DECLARE_MODULE_GLOBALS(recode) static PHP_GINIT_FUNCTION(recode); /* {{{ arginfo */ diff --git a/ext/session/session.c b/ext/session/session.c index 7a8199d810..0c08d49681 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -59,7 +59,7 @@ #include "mod_mm.h" #endif -PHPAPI ZEND_DECLARE_MODULE_GLOBALS(ps); +PHPAPI ZEND_DECLARE_MODULE_GLOBALS(ps) static int php_session_rfc1867_callback(unsigned int event, void *event_data, void **extra TSRMLS_DC); static int (*php_session_rfc1867_orig_callback)(unsigned int event, void *event_data, void **extra TSRMLS_DC); diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index de6d18094e..ae5e90cf9b 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -43,7 +43,7 @@ ZEND_BEGIN_MODULE_GLOBALS(browscap) browser_data activation_bdata; ZEND_END_MODULE_GLOBALS(browscap) -ZEND_DECLARE_MODULE_GLOBALS(browscap); +ZEND_DECLARE_MODULE_GLOBALS(browscap) #ifdef ZTS #define BROWSCAP_G(v) TSRMG(browscap_globals_id, zend_browscap_globals *, v) |