svn: /php/php-src/ branches/PHP_5_4/Zend/zend_operators.h trunk/Zend/zend_operators.h
| From: | Felipe Pena | Date: | Sun, 03 Jul 2011 01:29:23 +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-65397@lists.php.net to get a copy of this message | ||
felipe Sun, 03 Jul 2011 01:29:23 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312833
Log:
- Removed accidental offsetof definition
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-07-03 01:22:07 UTC (rev 312832)
+++ php/php-src/branches/PHP_5_4/Zend/zend_operators.h 2011-07-03 01:29:23 UTC (rev 312833)
@@ -451,11 +451,6 @@
#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)
{
if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
Modified: php/php-src/trunk/Zend/zend_operators.h
===================================================================
--- php/php-src/trunk/Zend/zend_operators.h 2011-07-03 01:22:07 UTC (rev 312832)
+++ php/php-src/trunk/Zend/zend_operators.h 2011-07-03 01:29:23 UTC (rev 312833)
@@ -451,11 +451,6 @@
#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)
{
if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {