Skip to content

Commit a9a3df2

Browse files
committed
Fix error on Windows
1 parent be9d4a5 commit a9a3df2

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

Zend/zend_interfaces.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,8 @@ ZEND_API HashTable *zend_user_it_get_gc(zend_object_iterator *_iter, zval **tabl
198198

199199
static const zend_object_iterator_funcs zend_interface_iterator_funcs_iterator = {
200200
zend_user_it_dtor,
201-
zend_user_it_valid,
201+
// FIXME: Adjust the actual function prototype in zend_object_iterator_funcs
202+
(int (*)(zend_object_iterator *)) zend_user_it_valid,
202203
zend_user_it_get_current_data,
203204
zend_user_it_get_current_key,
204205
zend_user_it_move_forward,

Zend/zend_virtual_cwd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ extern void virtual_cwd_main_cwd_init(uint8_t);
260260
#define VCWD_OPEN_MODE(path, flags, mode) virtual_open(path, flags, mode)
261261
#define VCWD_CREAT(path, mode) virtual_creat(path, mode)
262262
#define VCWD_CHDIR(path) virtual_chdir(path)
263-
#define VCWD_CHDIR_FILE(path) virtual_chdir_file(path, virtual_chdir)
263+
#define VCWD_CHDIR_FILE(path) virtual_chdir_file(path, (int (*)(const char *)) virtual_chdir)
264264
#define VCWD_GETWD(buf)
265265
#define VCWD_REALPATH(path, real_path) virtual_realpath(path, real_path)
266266
#define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname)

ext/session/session.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
PHPAPI ZEND_DECLARE_MODULE_GLOBALS(ps)
5858

5959
static zend_result php_session_rfc1867_callback(unsigned int event, void *event_data, void **extra);
60-
static int (*php_session_rfc1867_orig_callback)(unsigned int event, void *event_data, void **extra);
60+
static zend_result (*php_session_rfc1867_orig_callback)(unsigned int event, void *event_data, void **extra);
6161
static void php_session_track_init(void);
6262

6363
/* SessionHandler class */

main/rfc1867.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static php_rfc1867_getword_t php_rfc1867_getword = php_ap_getword;
4949
static php_rfc1867_getword_conf_t php_rfc1867_getword_conf = php_ap_getword_conf;
5050
static php_rfc1867_basename_t php_rfc1867_basename = NULL;
5151

52-
PHPAPI int (*php_rfc1867_callback)(unsigned int event, void *event_data, void **extra) = NULL;
52+
PHPAPI zend_result (*php_rfc1867_callback)(unsigned int event, void *event_data, void **extra) = NULL;
5353

5454
static void safe_php_register_variable(char *var, char *strval, size_t val_len, zval *track_vars_array, bool override_protection);
5555

main/rfc1867.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ typedef char* (*php_rfc1867_basename_t)(const zend_encoding *encoding, char *str
8383
SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler);
8484

8585
PHPAPI void destroy_uploaded_files_hash(void);
86-
extern PHPAPI int (*php_rfc1867_callback)(unsigned int event, void *event_data, void **extra);
86+
extern PHPAPI zend_result (*php_rfc1867_callback)(unsigned int event, void *event_data, void **extra);
8787

8888
SAPI_API void php_rfc1867_set_multibyte_callbacks(
8989
php_rfc1867_encoding_translation_t encoding_translation,

0 commit comments

Comments
 (0)