From: Felipe Pena <felipe@php.net>
Date: Sat, 18 Jun 2011 18:11:27 +0000 (+0000)
Subject: - Fixed compiler warning (redefinition of offsetof)
X-Git-Tag: php-5.4.0alpha1~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72c4e72570d25f7816d833d418a33930826d4472;p=php

- Fixed compiler warning (redefinition of offsetof)
---

diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 6987409f16..7f831f93ff 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -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)
 {