Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Remove extra ;

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

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.

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 */

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);

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)