Skip to content

Commit 6f9f0e1

Browse files
committed
Move "zend_ffi_cdata_ce" to Zend to allow JIT<->FFI interopability on Windows
1 parent 0f94a20 commit 6f9f0e1

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

Zend/zend.c

+2
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ ZEND_API zend_string *(*zend_resolve_path)(zend_string *filename);
9595
ZEND_API zend_result (*zend_post_startup_cb)(void) = NULL;
9696
ZEND_API void (*zend_post_shutdown_cb)(void) = NULL;
9797

98+
ZEND_API zend_class_entry *zend_ffi_cdata_ce = NULL;
99+
98100
/* This callback must be signal handler safe! */
99101
void (*zend_on_timeout)(int seconds);
100102

Zend/zend.h

+1
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,7 @@ ZEND_API ZEND_COLD ZEND_NORETURN void zend_strerror_noreturn(int type, int errn,
372372
#define ZEND_STANDARD_CLASS_DEF_PTR zend_standard_class_def
373373
extern ZEND_API zend_class_entry *zend_standard_class_def;
374374
extern ZEND_API zend_utility_values zend_uv;
375+
extern ZEND_API zend_class_entry *zend_ffi_cdata_ce;
375376

376377
/* If DTrace is available and enabled */
377378
extern ZEND_API bool zend_dtrace_enabled;

ext/ffi/ffi.c

-2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ static zend_class_entry *zend_ffi_parser_exception_ce;
117117
static zend_class_entry *zend_ffi_ce;
118118
static zend_class_entry *zend_ffi_ctype_ce;
119119

120-
ZEND_API zend_class_entry *zend_ffi_cdata_ce;
121-
122120
static zend_object_handlers zend_ffi_handlers;
123121
static zend_object_handlers zend_ffi_cdata_handlers;
124122
static zend_object_handlers zend_ffi_cdata_value_handlers;

ext/ffi/php_ffi.h

-2
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,6 @@ typedef struct _zend_ffi_ctype {
360360
zend_ffi_type *type;
361361
} zend_ffi_ctype;
362362

363-
extern ZEND_API zend_class_entry *zend_ffi_cdata_ce;
364-
365363
#define ZEND_FFI_TYPE_OWNED (1<<0)
366364

367365
#define ZEND_FFI_TYPE(t) \

0 commit comments

Comments
 (0)