Hi dmitry,

in Zend/zend_operators.h you have added the offsetof macro.

In some case, this macro is already defined and gcc throws a
compilation warning:

In file included from /home/fat/dev/php-src/branches/PHP_5_4/Zend/zend.h:818:0,
                 from /home/fat/dev/php-src/branches/PHP_5_4/main/php.h:34,
                 from
/home/fat/dev/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c:30:
/home/fat/dev/php-src/branches/PHP_5_4/Zend/zend_operators.h:454:0:
warning: "offsetof" redefined
/usr/lib/x86_64-linux-gnu/gcc/x86_64-linux-gnu/4.5.2/include/stddef.h:411:0:
note: this is the location of the previous definition

Can we add a #ifndef offsetof bloc arround the macro definition ?

++ jerome

2011/5/31 Dmitry Stogov <dmi...@php.net>:
> dmitry                                   Tue, 31 May 2011 12:05:25 +0000
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=311662
>
> Log:
> MFH: Arithmetic speedup. Inlined most probable code-paths for arithmetic 
> operations directly into executor.
>
> Changed paths:
>    U   php/php-src/branches/PHP_5_4/NEWS
>    U   php/php-src/branches/PHP_5_4/Zend/zend_multiply.h
>    U   php/php-src/branches/PHP_5_4/Zend/zend_operators.c
>    U   php/php-src/branches/PHP_5_4/Zend/zend_operators.h
>    U   php/php-src/branches/PHP_5_4/Zend/zend_vm_def.h
>    U   php/php-src/branches/PHP_5_4/Zend/zend_vm_execute.h
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to