From 7396d2e56be8a367bfa11c97ef08f4f0c5eeb854 Mon Sep 17 00:00:00 2001
From: Danack <Danack@basereality.com>
Date: Mon, 23 Feb 2015 14:25:19 +0000
Subject: [PATCH] Added PHP5.6 - only use strict compile options for 5.6

---
 .travis.yml | 5 ++++-
 imagick.c   | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64dce659..9d40b1c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: php
 php:
+    - 5.6
     - 5.5
     - 5.4
     - 5.3
@@ -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
@@ -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
diff --git a/imagick.c b/imagick.c
index a536acdc..ce09ab97 100644
--- a/imagick.c
+++ b/imagick.c
@@ -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);