1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
From b66718758dd220e95e59f449d59f65d7a5394279 Mon Sep 17 00:00:00 2001
From: Calvin Buckley <calvin@cmpct.info>
Date: Mon, 6 Jul 2026 14:18:19 -0300
Subject: [PATCH] XtOffsetOf is removed in 8.6, use standard C offsetof
---
imagick.c | 10 +++++-----
php_imagick_defs.h | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/imagick.c b/imagick.c
index 68e63e13..ed5ad958 100644
--- a/imagick.c
+++ b/imagick.c
@@ -1057,7 +1057,7 @@ PHP_MINIT_FUNCTION(imagick)
imagick_object_handlers.read_property = php_imagick_read_property;
imagick_object_handlers.count_elements = php_imagick_count_elements;
#if PHP_VERSION_ID >= 70000
- imagick_object_handlers.offset = XtOffsetOf(php_imagick_object, zo);
+ imagick_object_handlers.offset = offsetof(php_imagick_object, zo);
imagick_object_handlers.free_obj = php_imagick_object_free_storage;
#endif
@@ -1077,7 +1077,7 @@ PHP_MINIT_FUNCTION(imagick)
#endif
imagickdraw_object_handlers.clone_obj = php_imagick_clone_imagickdraw_object;
#if PHP_VERSION_ID >= 70000
- imagickdraw_object_handlers.offset = XtOffsetOf(php_imagickdraw_object, zo);
+ imagickdraw_object_handlers.offset = offsetof(php_imagickdraw_object, zo);
imagickdraw_object_handlers.free_obj = php_imagickdraw_object_free_storage;
#endif
php_imagickdraw_sc_entry = zend_register_internal_class(&ce TSRMLS_CC);
@@ -1095,7 +1095,7 @@ PHP_MINIT_FUNCTION(imagick)
#endif
imagickpixeliterator_object_handlers.clone_obj = NULL;
#if PHP_VERSION_ID >= 70000
- imagickpixeliterator_object_handlers.offset = XtOffsetOf(php_imagickpixeliterator_object, zo);
+ imagickpixeliterator_object_handlers.offset = offsetof(php_imagickpixeliterator_object, zo);
imagickpixeliterator_object_handlers.free_obj = php_imagickpixeliterator_object_free_storage;
#endif
php_imagickpixeliterator_sc_entry = zend_register_internal_class(&ce TSRMLS_CC);
@@ -1114,7 +1114,7 @@ PHP_MINIT_FUNCTION(imagick)
#endif
imagickpixel_object_handlers.clone_obj = php_imagick_clone_imagickpixel_object;
#if PHP_VERSION_ID >= 70000
- imagickpixel_object_handlers.offset = XtOffsetOf(php_imagickpixel_object, zo);
+ imagickpixel_object_handlers.offset = offsetof(php_imagickpixel_object, zo);
imagickpixel_object_handlers.free_obj = php_imagickpixel_object_free_storage;
#endif
@@ -1136,7 +1136,7 @@ PHP_MINIT_FUNCTION(imagick)
imagickkernel_object_handlers.get_debug_info = php_imagickkernel_get_debug_info;
imagickkernel_object_handlers.clone_obj = php_imagick_clone_imagickkernel_object;
#if PHP_VERSION_ID >= 70000
- imagickkernel_object_handlers.offset = XtOffsetOf(php_imagickkernel_object, zo);
+ imagickkernel_object_handlers.offset = offsetof(php_imagickkernel_object, zo);
imagickkernel_object_handlers.free_obj = php_imagickkernel_object_free_storage;
#endif
diff --git a/php_imagick_defs.h b/php_imagick_defs.h
index 2c5f990a..9ff83620 100644
--- a/php_imagick_defs.h
+++ b/php_imagick_defs.h
@@ -273,24 +273,24 @@ typedef struct _php_imagickkernel_object {
#if PHP_VERSION_ID >= 70000
static inline php_imagick_object *php_imagick_fetch_object(zend_object *obj) {
- return (php_imagick_object *)((char*)(obj) - XtOffsetOf(php_imagick_object, zo));
+ return (php_imagick_object *)((char*)(obj) - offsetof(php_imagick_object, zo));
}
static inline php_imagickdraw_object *php_imagickdraw_fetch_object(zend_object *obj) {
- return (php_imagickdraw_object *)((char*)(obj) - XtOffsetOf(php_imagickdraw_object, zo));
+ return (php_imagickdraw_object *)((char*)(obj) - offsetof(php_imagickdraw_object, zo));
}
static inline php_imagickpixel_object *php_imagickpixel_fetch_object(zend_object *obj) {
- return (php_imagickpixel_object *)((char*)(obj) - XtOffsetOf(php_imagickpixel_object, zo));
+ return (php_imagickpixel_object *)((char*)(obj) - offsetof(php_imagickpixel_object, zo));
}
static inline php_imagickpixeliterator_object *php_imagickpixeliterator_fetch_object(zend_object *obj) {
- return (php_imagickpixeliterator_object *)((char*)(obj) - XtOffsetOf(php_imagickpixeliterator_object, zo));
+ return (php_imagickpixeliterator_object *)((char*)(obj) - offsetof(php_imagickpixeliterator_object, zo));
}
#ifdef IMAGICK_WITH_KERNEL
static inline php_imagickkernel_object *php_imagickkernel_fetch_object(zend_object *obj) {
- return (php_imagickkernel_object *)((char*)(obj) - XtOffsetOf(php_imagickkernel_object, zo));
+ return (php_imagickkernel_object *)((char*)(obj) - offsetof(php_imagickkernel_object, zo));
}
#endif
|
