diff options
| -rw-r--r-- | ext/com_dotnet/php_com_dotnet.h | 2 | ||||
| -rw-r--r-- | ext/gd/gd.c | 4 | ||||
| -rw-r--r-- | ext/readline/readline_cli.c | 2 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 2 | ||||
| -rw-r--r-- | main/output.c | 2 | ||||
| -rw-r--r-- | sapi/cli/php_cli_server.c | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_rinit_hook.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/ext/com_dotnet/php_com_dotnet.h b/ext/com_dotnet/php_com_dotnet.h index e770fd3a94..025e1a7dd0 100644 --- 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 1c6cc74be6..7f9d057106 100644 --- 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 cfbf6d564f..c1ec134fff 100644 --- 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 6951c155ad..cb7524e0f9 100644 --- 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 3bc8c278e4..4639001dd4 100644 --- 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 dd26b5c971..1062c5b34c 100644 --- 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 8a1d821394..b85536c971 100644 --- 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 92013f5499..ddbc433669 100644 --- 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) |