Skip to content

Commit

Permalink
Added PHP5.6 - only use strict compile options for 5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Danack committed Feb 23, 2015
1 parent 7ba42ae commit 7396d2e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
@@ -1,5 +1,6 @@
language: php
php:
- 5.6
- 5.5
- 5.4
- 5.3
Expand All @@ -17,6 +18,8 @@ env:
before_script:
- for file in tests/*.phpt; do grep $(basename $file) package.xml >/dev/null || (echo "Missing $file from package.xml" ; exit 1); done
- ./imagemagick_dependency.sh "${IMAGEMAGICK_VERSION}"
- if [[ $TRAVIS_PHP_VERSION = '5.6' ]]; then COMPILE_FLAGS="-Wno-deprecated-declarations -Wdeclaration-after-statement -Werror"; else COMPILE_FLAGS=""; fi


script:
- export NO_INTERACTION=1
Expand All @@ -29,7 +32,7 @@ script:
- cp ./check-loaded.phpt /tmp/php-imagick-build/imagick-${PHP_IMAGICK_VERSION}/check-loaded.phpt
- cd /tmp/php-imagick-build/imagick-${PHP_IMAGICK_VERSION}
- phpize
- export CFLAGS="-Wno-deprecated-declarations -Wdeclaration-after-statement -Werror"
- export CFLAGS=$COMPILE_FLAGS
- ./configure --with-imagick="${HOME}/imagemagick-${IMAGEMAGICK_VERSION}"
- make
- php run-tests.php -d extension=imagick.so -d extension_dir=modules -n ./*.phpt
Expand Down
2 changes: 0 additions & 2 deletions imagick.c
Expand Up @@ -2830,8 +2830,6 @@ static zend_object_value php_imagickpixel_object_new_ex(zend_class_entry *class_
return retval;
}

#undef object_properties_init

static zend_object_value php_imagickpixel_object_new(zend_class_entry *class_type TSRMLS_DC)
{
return php_imagickpixel_object_new_ex(class_type, NULL TSRMLS_CC);
Expand Down

0 comments on commit 7396d2e

Please sign in to comment.