diff options
Diffstat (limited to 'main/SAPI.h')
| -rw-r--r-- | main/SAPI.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/main/SAPI.h b/main/SAPI.h index b55252f054..a2e261e526 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -61,8 +61,9 @@ typedef struct { typedef struct _sapi_post_entry sapi_post_entry; typedef struct _sapi_module_struct sapi_module_struct; - +BEGIN_EXTERN_C(); extern SAPI_API sapi_module_struct sapi_module; /* true global */ +END_EXTERN_C(); /* Some values in this structure needs to be filled in before * calling sapi_activate(). We WILL change the `char *' entries, @@ -124,6 +125,7 @@ typedef struct _sapi_globals_struct { } sapi_globals_struct; +BEGIN_EXTERN_C(); #ifdef ZTS # define SG(v) TSRMG(sapi_globals_id, sapi_globals_struct *, v) SAPI_API extern int sapi_globals_id; @@ -137,6 +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(); /* * This is the preferred and maintained API for @@ -161,9 +164,9 @@ typedef enum { /* Parameter: */ SAPI_HEADER_SET_STATUS /* int */ } sapi_header_op_enum; +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. */ SAPI_API int sapi_add_header_ex(char *header_line, uint header_line_len, zend_bool duplicate, zend_bool replace TSRMLS_DC); #define sapi_add_header(a, b, c) sapi_add_header_ex((a),(b),(c),1 TSRMLS_CC) @@ -194,6 +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(); struct _sapi_module_struct { char *name; @@ -274,10 +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(); 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(); #define STANDARD_SAPI_MODULE_PROPERTIES |