diff options
author | Christopher Jones <sixd@php.net> | 2013-08-21 15:43:19 -0700 |
---|---|---|
committer | Christopher Jones <sixd@php.net> | 2013-08-21 15:43:19 -0700 |
commit | 11087eece75786fd053161b431de056bf1052380 (patch) | |
tree | 1b14e48148c0d017af2f7728e16e660287c60af3 /ext/dom/php_dom.c | |
parent | d2a2e949fea336787c23215aa8d91f3e7a41a432 (diff) | |
parent | 54d4a28003f35020a734b172d263b9e15b38950f (diff) | |
download | php-git-11087eece75786fd053161b431de056bf1052380.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]"
Suppress compiler warning "warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]"
Diffstat (limited to 'ext/dom/php_dom.c')
-rw-r--r-- | ext/dom/php_dom.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index 1e98567dca..db8ec83a44 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -1089,7 +1089,11 @@ void dom_xpath_objects_free_storage(void *object TSRMLS_DC) void dom_objects_free_storage(void *object TSRMLS_DC) { dom_object *intern = (dom_object *)object; +#if defined(__GNUC__) && __GNUC__ >= 3 + int retcount __attribute__((unused)); /* keep compiler quiet */ +#else int retcount; +#endif zend_object_std_dtor(&intern->std TSRMLS_CC); |