Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix use of EXTERN_C macros

  • Loading branch information...
commit 3d6426ee14a38bed1ebbccaf75d8eccfd7d08060 1 parent 469b746
Ard Biesheuvel authored
View
10 ext/standard/basic_functions.c
@@ -103,14 +103,14 @@ static
ZEND_BEGIN_ARG_INFO(first_and_second__args_force_ref, 0)
ZEND_ARG_PASS_INFO(1)
ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(second_and_third_args_force_ref, 0)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(1)
ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(third_and_fourth_args_force_ref, 0)
@@ -118,21 +118,21 @@ static
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(1)
ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(third_and_rest_force_ref, 1)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(0)
ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(first_through_third_args_force_ref, 0)
ZEND_ARG_PASS_INFO(1)
ZEND_ARG_PASS_INFO(1)
ZEND_ARG_PASS_INFO(1)
- ZEND_END_ARG_INFO();
+ ZEND_END_ARG_INFO()
typedef struct _php_shutdown_function_entry {
zval **arguments;
View
2  ext/standard/info.h
@@ -83,6 +83,6 @@ PHPAPI void php_info_print_hr(void);
PHPAPI char *php_logo_guid(void);
void register_phpinfo_constants(INIT_FUNC_ARGS);
-END_EXTERN_C();
+END_EXTERN_C()
#endif /* INFO_H */
View
16 main/SAPI.h
@@ -61,9 +61,9 @@ typedef struct {
typedef struct _sapi_post_entry sapi_post_entry;
typedef struct _sapi_module_struct sapi_module_struct;
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
extern SAPI_API sapi_module_struct sapi_module; /* true global */
-END_EXTERN_C();
+END_EXTERN_C()
/* Some values in this structure needs to be filled in before
* calling sapi_activate(). We WILL change the `char *' entries,
@@ -125,7 +125,7 @@ typedef struct _sapi_globals_struct {
} sapi_globals_struct;
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
#ifdef ZTS
# define SG(v) TSRMG(sapi_globals_id, sapi_globals_struct *, v)
SAPI_API extern int sapi_globals_id;
@@ -139,7 +139,7 @@ SAPI_API void sapi_shutdown(void);
SAPI_API void sapi_activate(TSRMLS_D);
SAPI_API void sapi_deactivate(TSRMLS_D);
SAPI_API void sapi_initialize_empty_request(TSRMLS_D);
-END_EXTERN_C();
+END_EXTERN_C()
/*
* This is the preferred and maintained API for
@@ -164,7 +164,7 @@ typedef enum { /* Parameter: */
SAPI_HEADER_SET_STATUS /* int */
} sapi_header_op_enum;
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC);
/* Deprecated functions. Use sapi_header_op instead. */
@@ -197,7 +197,7 @@ SAPI_API int sapi_force_http_10(TSRMLS_D);
SAPI_API int sapi_get_target_uid(uid_t * TSRMLS_DC);
SAPI_API int sapi_get_target_gid(gid_t * TSRMLS_DC);
-END_EXTERN_C();
+END_EXTERN_C()
struct _sapi_module_struct {
char *name;
@@ -278,12 +278,12 @@ struct _sapi_post_entry {
#define SAPI_TREAT_DATA_FUNC(treat_data) void treat_data(int arg, char *str, zval* destArray TSRMLS_DC)
#define SAPI_INPUT_FILTER_FUNC(input_filter) unsigned int input_filter(int arg, char *var, char **val, unsigned int val_len TSRMLS_DC)
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data);
SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader);
SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data);
SAPI_API SAPI_INPUT_FILTER_FUNC(php_default_input_filter);
-END_EXTERN_C();
+END_EXTERN_C()
#define STANDARD_SAPI_MODULE_PROPERTIES
View
4 main/php_main.h
@@ -26,7 +26,7 @@
#include "php_globals.h"
#include "SAPI.h"
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
PHPAPI int php_request_startup(TSRMLS_D);
PHPAPI void php_request_shutdown(void *dummy);
PHPAPI void php_request_shutdown_for_exec(void *dummy);
@@ -53,6 +53,6 @@ extern void php_call_shutdown_functions(void);
/* environment module */
extern int php_init_environ(void);
extern int php_shutdown_environ(void);
-END_EXTERN_C();
+END_EXTERN_C()
#endif
View
4 main/php_variables.h
@@ -30,7 +30,7 @@
#define PARSE_COOKIE 2
#define PARSE_STRING 3
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC);
void php_startup_auto_globals(TSRMLS_D);
extern PHPAPI void (*php_import_environment_variables)(zval *array_ptr TSRMLS_DC);
@@ -40,7 +40,7 @@ PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, pval *
PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array TSRMLS_DC);
int php_hash_environment(TSRMLS_D);
-END_EXTERN_C();
+END_EXTERN_C()
#define NUM_TRACK_VARS 6
Please sign in to comment.
Something went wrong with that request. Please try again.