- Fixed compiler warning (redefinition of offsetof)

felipe · felipe · commit b2d660569638 · 2011-06-18T18:11:27.000Z
git-svn-id: http://svn.php.net/repository/php/php-src/trunk@312264 c90b9560-bf6c-de11-be94-00142212c4b1
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -451,8 +451,10 @@ ZEND_API void zend_update_current_locale(void);`
`451`	`451`	`#define zend_update_current_locale()`
`452`	`452`	`#endif`
`453`	`453`
	`454`	`+#ifndef offsetof`
`454`	`455`	`#define offsetof(t,f) \`
`455`	`456`	`((int)(&((t*)0)->f))`
	`457`	`+#endif`
`456`	`458`
`457`	`459`	`static zend_always_inline int fast_increment_function(zval *op1)`
`458`	`460`	`{`