diff options
| -rw-r--r-- | Zend/zend_extensions.h | 4 | ||||
| -rw-r--r-- | Zend/zend_ini_scanner.h | 4 | ||||
| -rw-r--r-- | Zend/zend_list.c | 4 | ||||
| -rw-r--r-- | Zend/zend_list.h | 5 |
4 files changed, 9 insertions, 8 deletions
diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h index 9d3a8ff3ef..dc9d230098 100644 --- a/Zend/zend_extensions.h +++ b/Zend/zend_extensions.h @@ -38,8 +38,8 @@ typedef struct _zend_extension zend_extension; /* Typedef's for zend_extension function pointers */ typedef int (*startup_func_t)(zend_extension *extension); typedef void (*shutdown_func_t)(zend_extension *extension); -typedef void (*activate_func_t)(); -typedef void (*deactivate_func_t)(); +typedef void (*activate_func_t)(void); +typedef void (*deactivate_func_t)(void); typedef void (*message_handler_func_t)(int message, void *arg); diff --git a/Zend/zend_ini_scanner.h b/Zend/zend_ini_scanner.h index ebca1b700d..c88174bd66 100644 --- a/Zend/zend_ini_scanner.h +++ b/Zend/zend_ini_scanner.h @@ -14,8 +14,8 @@ public: #endif /* ZTS && __cplusplus */ BEGIN_EXTERN_C() -int zend_ini_scanner_get_lineno(); -char *zend_ini_scanner_get_filename(); +int zend_ini_scanner_get_lineno(void); +char *zend_ini_scanner_get_filename(void); int zend_ini_open_file_for_scanning(zend_file_handle *fh); void zend_ini_close_file(zend_file_handle *fh); int ini_lex(zval *ini_lval); diff --git a/Zend/zend_list.c b/Zend/zend_list.c index fddca21d93..3374921a38 100644 --- a/Zend/zend_list.c +++ b/Zend/zend_list.c @@ -392,13 +392,13 @@ ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_fu } -int zend_init_rsrc_list_dtors() +int zend_init_rsrc_list_dtors(void) { return zend_hash_init(&list_destructors, 50, NULL, NULL, 1); } -void zend_destroy_rsrc_list_dtors() +void zend_destroy_rsrc_list_dtors(void) { zend_hash_destroy(&list_destructors); } diff --git a/Zend/zend_list.h b/Zend/zend_list.h index 6e92b014f5..91319deb4d 100644 --- a/Zend/zend_list.h +++ b/Zend/zend_list.h @@ -71,8 +71,8 @@ int zend_init_rsrc_list(ELS_D); int zend_init_rsrc_plist(ELS_D); void zend_destroy_rsrc_list(ELS_D); void zend_destroy_rsrc_plist(ELS_D); -int zend_init_rsrc_list_dtors(); -void zend_destroy_rsrc_list_dtors(); +int zend_init_rsrc_list_dtors(void); +void zend_destroy_rsrc_list_dtors(void); ZEND_API int zend_list_insert(void *ptr, int type); ZEND_API int zend_plist_insert(void *ptr, int type); @@ -84,6 +84,7 @@ ZEND_API void *zend_list_find(int id, int *type); ZEND_API void *zend_plist_find(int id, int *type); ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type); +ZEND_API int zend_register_false_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type); ZEND_API void *zend_fetch_resource(zval **passed_id, int default_id, char *resource_type_name, int *found_resource_type, int num_resource_types, ...); ZEND_API char *zend_rsrc_list_get_rsrc_type(int resource); |