From 08a006d08a4c35d2c3ecc9a3d10cf7fd14661a84 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Tue, 29 Jul 2014 17:12:47 +0000 Subject: Rename all patches that contain '::' as a path separator, and use '__' instead. --- lang/php5/files/patch-Zend::zend.h | 11 ----------- lang/php5/files/patch-Zend__zend.h | 11 +++++++++++ lang/php5/files/patch-main::php_config.h.in | 12 ------------ lang/php5/files/patch-main__php_config.h.in | 12 ++++++++++++ 4 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 lang/php5/files/patch-Zend::zend.h create mode 100644 lang/php5/files/patch-Zend__zend.h delete mode 100644 lang/php5/files/patch-main::php_config.h.in create mode 100644 lang/php5/files/patch-main__php_config.h.in (limited to 'lang/php5/files') diff --git a/lang/php5/files/patch-Zend::zend.h b/lang/php5/files/patch-Zend::zend.h deleted file mode 100644 index 2b565146f7de..000000000000 --- a/lang/php5/files/patch-Zend::zend.h +++ /dev/null @@ -1,11 +0,0 @@ ---- Zend/zend.h.orig 2013-12-10 19:32:43.000000000 +0000 -+++ Zend/zend.h 2013-12-13 21:55:53.836235768 +0000 -@@ -180,7 +180,7 @@ char *alloca (); - #endif - #define restrict __restrict__ - --#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) -+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) && !(defined(ZTS) && defined(__FreeBSD__)) - # define ZEND_ALLOCA_MAX_SIZE (32 * 1024) - # define ALLOCA_FLAG(name) \ - zend_bool name; diff --git a/lang/php5/files/patch-Zend__zend.h b/lang/php5/files/patch-Zend__zend.h new file mode 100644 index 000000000000..2b565146f7de --- /dev/null +++ b/lang/php5/files/patch-Zend__zend.h @@ -0,0 +1,11 @@ +--- Zend/zend.h.orig 2013-12-10 19:32:43.000000000 +0000 ++++ Zend/zend.h 2013-12-13 21:55:53.836235768 +0000 +@@ -180,7 +180,7 @@ char *alloca (); + #endif + #define restrict __restrict__ + +-#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) ++#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) && !(defined(ZTS) && defined(__FreeBSD__)) + # define ZEND_ALLOCA_MAX_SIZE (32 * 1024) + # define ALLOCA_FLAG(name) \ + zend_bool name; diff --git a/lang/php5/files/patch-main::php_config.h.in b/lang/php5/files/patch-main::php_config.h.in deleted file mode 100644 index 3ce79e95c55a..000000000000 --- a/lang/php5/files/patch-main::php_config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- main/php_config.h.in.orig 2013-12-10 20:12:52.000000000 +0000 -+++ main/php_config.h.in 2013-12-13 21:55:54.207235635 +0000 -@@ -2375,6 +2375,9 @@ - /* Define if processor uses big-endian word */ - #undef WORDS_BIGENDIAN - -+/* Include external shared modules configurations */ -+#include "ext/php_config.h" -+ - /* Whether sprintf is broken */ - #undef ZEND_BROKEN_SPRINTF - diff --git a/lang/php5/files/patch-main__php_config.h.in b/lang/php5/files/patch-main__php_config.h.in new file mode 100644 index 000000000000..3ce79e95c55a --- /dev/null +++ b/lang/php5/files/patch-main__php_config.h.in @@ -0,0 +1,12 @@ +--- main/php_config.h.in.orig 2013-12-10 20:12:52.000000000 +0000 ++++ main/php_config.h.in 2013-12-13 21:55:54.207235635 +0000 +@@ -2375,6 +2375,9 @@ + /* Define if processor uses big-endian word */ + #undef WORDS_BIGENDIAN + ++/* Include external shared modules configurations */ ++#include "ext/php_config.h" ++ + /* Whether sprintf is broken */ + #undef ZEND_BROKEN_SPRINTF + -- cgit v1.2.3