svn: /php/php-src/ branches/PHP_5_4/Zend/zend_operators.h trunk/Zend/zend_operators.h
| From: | Felipe Pena | Date: | Sat, 18 Jun 2011 18:11:27 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/Zend/zend_operators.h trunk/Zend/zend_operators.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65262@lists.php.net to get a copy of this message | ||
felipe Sat, 18 Jun 2011 18:11:27 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312264
Log:
- Fixed compiler warning (redefinition of offsetof)
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_operators.h
U php/php-src/trunk/Zend/zend_operators.h
Modified: php/php-src/branches/PHP_5_4/Zend/zend_operators.h
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_operators.h 2011-06-18 17:46:16 UTC (rev 312263)
+++ php/php-src/branches/PHP_5_4/Zend/zend_operators.h 2011-06-18 18:11:27 UTC (rev 312264)
@@ -451,8 +451,10 @@
#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)
{
Modified: php/php-src/trunk/Zend/zend_operators.h
===================================================================
--- php/php-src/trunk/Zend/zend_operators.h 2011-06-18 17:46:16 UTC (rev 312263)
+++ php/php-src/trunk/Zend/zend_operators.h 2011-06-18 18:11:27 UTC (rev 312264)
@@ -451,8 +451,10 @@
#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)
{