- Change to offsetof as suggested by Clayton

diff --git a/ext/unicode/unicode_iterators.c b/ext/unicode/unicode_iterators.c
index afcb29f820e40696cf8181b982bd9e8d3addda64..77ad25482e5bde581405afcaeec97794ec237151 100644 (file)
--- a/ext/unicode/unicode_iterators.c
+++ b/ext/unicode/unicode_iterators.c
@@ -77,10 +77,7 @@ typedef struct {
 
 static inline text_iter_obj* text_iter_to_obj(zend_object_iterator *iter)
 {
-       static text_iter_obj adr;
-       static int ofs = (char*)&adr.iter - (char*)&adr;
-
-       return (text_iter_obj *)((char*)iter - ofs);
+       return (text_iter_obj *)((char*)iter - offsetof(text_iter_obj, iter));
 }
 
 typedef struct {