summaryrefslogtreecommitdiff
path: root/php/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2018-10-29 11:44:23 +0100
committerBenoit Foucher <benoit@zeroc.com>2018-10-29 11:44:23 +0100
commit499f033247c53f4db02f8ae7f7e6b3fe6369a10c (patch)
tree348bcf07190acf986f3ac4954b668ffb9693524c /php/src
parentFixed check for clang version on Sierra (diff)
downloadice-499f033247c53f4db02f8ae7f7e6b3fe6369a10c.tar.bz2
ice-499f033247c53f4db02f8ae7f7e6b3fe6369a10c.tar.xz
ice-499f033247c53f4db02f8ae7f7e6b3fe6369a10c.zip
Fix for PHP 5.3 (Amzn 2018.03) build failures
Diffstat (limited to 'php/src')
-rw-r--r--php/src/php5/Config.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/php/src/php5/Config.h b/php/src/php5/Config.h
index 62a1e144a6e..0a2072b2dd9 100644
--- a/php/src/php5/Config.h
+++ b/php/src/php5/Config.h
@@ -51,6 +51,13 @@ extern "C"
#endif
//
+// Ignore redundant redeclarations from php 5.3 php-output.h header.
+//
+#if defined(__GNUC__) && PHP_VERSION_ID < 50400
+# pragma GCC diagnostic ignored "-Wredundant-decls"
+#endif
+
+//
// The php.h header defines/undefines NDEBUG based on how the PHP binary was built.
// As a result, asserts are always disabled unless building against a php binary
// built with --enable-debug. We want to enable asserts for the PHP Ice extension