Code tweaks: Remove unneeded semicolons

diff --git a/ext/com_dotnet/php_com_dotnet.h b/ext/com_dotnet/php_com_dotnet.h
index e770fd3a94d36220885506c0f25cdd3322ba2965..025e1a7dd0c855521c5bd441c5d9900bf9f30991 100644 (file)
--- a/ext/com_dotnet/php_com_dotnet.h
+++ b/ext/com_dotnet/php_com_dotnet.h
@@ -49,7 +49,7 @@ ZEND_END_MODULE_GLOBALS(com_dotnet)
 ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
-extern ZEND_DECLARE_MODULE_GLOBALS(com_dotnet);
+ZEND_EXTERN_MODULE_GLOBALS(com_dotnet)
 #define COMG(v) ZEND_MODULE_GLOBALS_ACCESSOR(com_dotnet, v)
 
 #endif /* PHP_COM_DOTNET_H */

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 1c6cc74be66dff2a3fa9ace980ae7a01c3c1772d..7f9d057106dd3a144b3c5020f3881a928a1d0a14 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -195,7 +195,7 @@ zend_object *php_gd_image_object_create(zend_class_entry *class_type)
        intern->std.handlers = &php_gd_image_object_handlers;
 
        return &intern->std;
-};
+}
 
 static void php_gd_image_object_free(zend_object *intern)
 {
@@ -204,7 +204,7 @@ static void php_gd_image_object_free(zend_object *intern)
        img_obj_ptr->image = NULL;
 
        zend_object_std_dtor(intern);
-};
+}
 
 /**
  * Creates a new GdImage object wrapping the gdImagePtr and attaches it

diff --git a/ext/readline/readline_cli.c b/ext/readline/readline_cli.c
index cfbf6d564f69c00e1890ec4fcbe64a4c18b99dbf..c1ec134ffff0292f92fabd713e00950eaf5834b0 100644 (file)
--- a/ext/readline/readline_cli.c
+++ b/ext/readline/readline_cli.c
@@ -70,7 +70,7 @@
 
 #define DEFAULT_PROMPT "\\b \\> "
 
-ZEND_DECLARE_MODULE_GLOBALS(cli_readline);
+ZEND_DECLARE_MODULE_GLOBALS(cli_readline)
 
 static char php_last_char = '\0';
 static FILE *pager_pipe = NULL;

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 6951c155ad7ba0db4671ff0f5cc100b294b723ce..cb7524e0f9e6e7fbedb714a308d9c9d44d0d14bc 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -47,7 +47,7 @@ int le_deflate;
 int le_inflate;
 #define le_inflate_name "zlib inflate"
 
-ZEND_DECLARE_MODULE_GLOBALS(zlib);
+ZEND_DECLARE_MODULE_GLOBALS(zlib)
 
 /* {{{ Memory management wrappers */
 

diff --git a/main/output.c b/main/output.c
index 3bc8c278e43c81b5a13da9177aecd959788ec479..4639001dd43c2da81720d5c775c7e4adfc2b66bd 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -31,7 +31,7 @@
 #include "zend_stack.h"
 #include "php_output.h"
 
-PHPAPI ZEND_DECLARE_MODULE_GLOBALS(output);
+PHPAPI ZEND_DECLARE_MODULE_GLOBALS(output)
 
 const char php_output_default_handler_name[sizeof("default output handler")] = "default output handler";
 const char php_output_devnull_handler_name[sizeof("null output handler")] = "null output handler";

diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index dd26b5c971dab5012744bcdc8ce033d731a3b28b..1062c5b34cfcda4cb2785732bdab1ae907209c1d 100644 (file)
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -225,7 +225,7 @@ static void php_cli_server_buffer_append(php_cli_server_buffer *buffer, php_cli_
 static void php_cli_server_logf(int type, const char *format, ...);
 static void php_cli_server_log_response(php_cli_server_client *client, int status, const char *message);
 
-ZEND_DECLARE_MODULE_GLOBALS(cli_server);
+ZEND_DECLARE_MODULE_GLOBALS(cli_server)
 
 /* {{{ static char php_cli_server_css[]
  * copied from ext/standard/info.c

diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 8a1d8213948bfe47a635556953a6f11c7c96d632..b85536c97143625abf9f7d98edc9d5aa45a4c5eb 100644 (file)
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -56,7 +56,7 @@
 ZEND_TSRMLS_CACHE_DEFINE()
 #endif
 
-ZEND_DECLARE_MODULE_GLOBALS(phpdbg);
+ZEND_DECLARE_MODULE_GLOBALS(phpdbg)
 int phpdbg_startup_run = 0;
 
 static PHP_INI_MH(OnUpdateEol)

diff --git a/sapi/phpdbg/phpdbg_rinit_hook.c b/sapi/phpdbg/phpdbg_rinit_hook.c
index 92013f5499ea16782c30b90e32944f1e43707c5b..ddbc43366939cc6a4c286f17c2bb7339fe8c77c2 100644 (file)
--- a/sapi/phpdbg/phpdbg_rinit_hook.c
+++ b/sapi/phpdbg/phpdbg_rinit_hook.c
@@ -18,7 +18,7 @@
 #include "php_ini.h"
 #include <errno.h>
 
-ZEND_DECLARE_MODULE_GLOBALS(phpdbg_webhelper);
+ZEND_DECLARE_MODULE_GLOBALS(phpdbg_webhelper)
 
 PHP_INI_BEGIN()
        STD_PHP_INI_ENTRY("phpdbg.auth", "", PHP_INI_SYSTEM | PHP_INI_PERDIR, OnUpdateString, auth, zend_phpdbg_webhelper_globals, phpdbg_webhelper_globals)