archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Ignore getcwd return in zend_compile

Browse source 
To do this move the php_ignore_value macro to ZEND_IGNORE_VALUE.
This commit is contained in:
Nikita Popov 2015-07-16 22:48:56 +02:00
parent 208257eec5
commit c568ffe517
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/zend_compile.c
View file

@ -5667,9 +5667,9 @@ static zend_bool zend_try_ct_eval_magic_const(zval *zv, zend_ast *ast) /* {{{ */
if (strcmp(ZSTR_VAL(dirname), ".") == 0) { if (strcmp(ZSTR_VAL(dirname), ".") == 0) {
dirname = zend_string_extend(dirname, MAXPATHLEN, 0); dirname = zend_string_extend(dirname, MAXPATHLEN, 0);
#if HAVE_GETCWD #if HAVE_GETCWD
VCWD_GETCWD(ZSTR_VAL(dirname), MAXPATHLEN); ZEND_IGNORE_VALUE(VCWD_GETCWD(ZSTR_VAL(dirname), MAXPATHLEN));
#elif HAVE_GETWD #elif HAVE_GETWD
VCWD_GETWD(ZSTR_VAL(dirname)); ZEND_IGNORE_VALUE(VCWD_GETWD(ZSTR_VAL(dirname)));
#endif #endif
} }

6
Zend/zend_portability.h
View file

@ -117,6 +117,12 @@
# define EMPTY_SWITCH_DEFAULT_CASE() default: ZEND_ASSUME(0); break; # define EMPTY_SWITCH_DEFAULT_CASE() default: ZEND_ASSUME(0); break;
#endif #endif
#if defined(__GNUC__) && __GNUC__ >= 4
# define ZEND_IGNORE_VALUE(x) (({ __typeof__ (x) __x = (x); (void) __x; }))
#else
# define ZEND_IGNORE_VALUE(x) ((void) (x))
#endif
/* all HAVE_XXX test have to be after the include of zend_config above */ /* all HAVE_XXX test have to be after the include of zend_config above */
#if defined(HAVE_LIBDL) && !defined(ZEND_WIN32) #if defined(HAVE_LIBDL) && !defined(ZEND_WIN32)

6
main/php.h
View file

@ -257,11 +257,7 @@ END_EXTERN_C()
# endif # endif
#endif #endif
#if defined(__GNUC__) && __GNUC__ >= 4 #define php_ignore_value(x) ZEND_IGNORE_VALUE(x)
# define php_ignore_value(x) (({ __typeof__ (x) __x = (x); (void) __x; }))
#else
# define php_ignore_value(x) ((void) (x))
#endif
/* global variables */ /* global variables */
#if !defined(PHP_WIN32) #if !defined(PHP_WIN32)