helly Fri Feb 17 08:24:56 2006 UTC
Modified files:
/php-src/ext/unicode unicode_iterators.c
Log:
- Change to offsetof as suggested by Clayton
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/unicode_iterators.c?r1=1.21&r2=1.22&diff_format=u
Index: php-src/ext/unicode/unicode_iterators.c
diff -u php-src/ext/unicode/unicode_iterators.c:1.21
php-src/ext/unicode/unicode_iterators.c:1.22
--- php-src/ext/unicode/unicode_iterators.c:1.21 Wed Feb 15 21:34:21 2006
+++ php-src/ext/unicode/unicode_iterators.c Fri Feb 17 08:24:56 2006
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: unicode_iterators.c,v 1.21 2006/02/15 21:34:21 helly Exp $ */
+/* $Id: unicode_iterators.c,v 1.22 2006/02/17 08:24:56 helly Exp $ */
/*
* TODO
@@ -77,10 +77,7 @@
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 {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
