summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2011-06-18 18:11:27 +0000
committerFelipe Pena <felipe@php.net>2011-06-18 18:11:27 +0000
commit72c4e72570d25f7816d833d418a33930826d4472 (patch)
tree60616428cf58bcd950e12d8f6303ca7e4449418b /Zend
parent63db6d14354765457c99c80796841cab5e43ae30 (diff)
downloadphp-git-72c4e72570d25f7816d833d418a33930826d4472.tar.gz
- Fixed compiler warning (redefinition of offsetof)
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_operators.h2
1 files changed, 2 insertions, 0 deletions
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)
{