]> granicus.if.org Git - php/commitdiff
- Fixed compiler warning (redefinition of offsetof)
authorFelipe Pena <felipe@php.net>
Sat, 18 Jun 2011 18:11:27 +0000 (18:11 +0000)
committerFelipe Pena <felipe@php.net>
Sat, 18 Jun 2011 18:11:27 +0000 (18:11 +0000)
Zend/zend_operators.h

index 6987409f164333414791dce2fc82ca962b01ffe0..7f831f93ffbef7a2337120726843752e1f3799df 100644 (file)
@@ -451,8 +451,10 @@ ZEND_API void zend_update_current_locale(void);
 #define zend_update_current_locale()
 #endif
 
+#ifndef offsetof
 #define offsetof(t,f) \
        ((int)(&((t*)0)->f))
+#endif
 
 static zend_always_inline int fast_increment_function(zval *op1)
 {