From: Marcus Boerger <helly@php.net>
Date: Fri, 17 Feb 2006 08:24:56 +0000 (+0000)
Subject: - Change to offsetof as suggested by Clayton
X-Git-Tag: RELEASE_1_2~189
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f81239a2b329a42d4d09d3e3e7b6140f050055cd;p=php

- Change to offsetof as suggested by Clayton
---

diff --git a/ext/unicode/unicode_iterators.c b/ext/unicode/unicode_iterators.c
index afcb29f820..77ad25482e 100644
--- 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 {