diff options
Diffstat (limited to '2793.patch')
| -rw-r--r-- | 2793.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/2793.patch b/2793.patch new file mode 100644 index 0000000..3188d73 --- /dev/null +++ b/2793.patch @@ -0,0 +1,36 @@ +From 1d6f796b16a62c4334ea134310a80833cd2fee7e Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Sun, 7 Sep 2014 17:43:26 +0200 +Subject: [PATCH] switch headers + avoid duplicate definition + +--- + build/_resource/config/phalcon_c_priority_files.php | 4 ++-- + build/_resource/config/phalcon_c_skip_files.php | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/build/_resource/config/phalcon_c_priority_files.php b/build/_resource/config/phalcon_c_priority_files.php +index f01c403..5414dee 100644 +--- a/build/_resource/config/phalcon_c_priority_files.php ++++ b/build/_resource/config/phalcon_c_priority_files.php +@@ -3,8 +3,8 @@ + + return array( + // Header files +- 'assets/filters/jsminifier.h', +- 'assets/filters/cssminifier.h', ++ 'assets/filters/nojsminifier.h', ++ 'assets/filters/nocssminifier.h', + 'mvc/model/query/parser.h', + 'mvc/model/query/scanner.h', + 'mvc/model/query/phql.h', +diff --git a/build/_resource/config/phalcon_c_skip_files.php b/build/_resource/config/phalcon_c_skip_files.php +index 613dd1b..a7ef989 100644 +--- a/build/_resource/config/phalcon_c_skip_files.php ++++ b/build/_resource/config/phalcon_c_skip_files.php +@@ -11,4 +11,6 @@ + 'annotations/base.c', + 'mvc/model/query/base.c', + 'mvc/view/engine/volt/base.c', ++ 'assets/filters/jsminifier.h', ++ 'assets/filters/cssminifier.h', + ); |