Skip to content

Commit e52a615

Browse files
committed
Another attempt to fix windows
1 parent 547efec commit e52a615

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

Zend/zend_frameless_function.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
#include <stddef.h>
2020

21-
#include "zend.h"
22-
2321
size_t zend_flf_count = 0;
2422
size_t zend_flf_capacity = 0;
2523
ZEND_API void **zend_flf_handlers = NULL;

Zend/zend_frameless_function.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@
2020
#include <stdint.h>
2121
#include <stddef.h>
2222

23+
#ifdef PHP_WIN32
24+
# include <config.w32.h>
25+
#else
26+
# include <php_config.h>
27+
#endif
28+
29+
#include "zend_portability.h"
30+
2331
#define DIRECT_FUNCTION_PARAMETERS_0 zval *return_value
2432
#define DIRECT_FUNCTION_PARAMETERS_1 zval *return_value, zval *arg1
2533
#define DIRECT_FUNCTION_PARAMETERS_2 zval *return_value, zval *arg1, zval *arg2
@@ -71,6 +79,8 @@
7179
zval_ptr_dtor(arg ## arg_num); \
7280
}
7381

82+
BEGIN_EXTERN_C()
83+
7484
typedef struct _zval_struct zval;
7585
typedef union _zend_function zend_function;
7686

@@ -81,12 +91,14 @@ typedef void (*zend_frameless_function_3)(zval *return_value, zval *op1, zval *o
8191

8292
extern size_t zend_flf_count;
8393
extern size_t zend_flf_capacity;
84-
extern void **zend_flf_handlers;
94+
ZEND_API extern void **zend_flf_handlers;
8595
extern zend_function **zend_flf_functions;
8696

8797
typedef struct {
8898
void *handler;
8999
uint32_t num_args;
90100
} zend_frameless_function_info;
91101

102+
END_EXTERN_C()
103+
92104
#endif

0 commit comments

Comments
 (0)