MFH: - Fixed bug #28930 (PHP sources pick wrong header files generated by bison).

diff --git a/NEWS b/NEWS
index 00643887fdf3ebf5269a41f29ad450e6940fc73d..42ad88bbdd3b7e96be3cf0f299def7bdd9aac8f2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,8 @@ PHP                                                                        NEWS
   string key). (Derick)
 - Fixed bug #31056 (php_std_date() returns invalid formatted date if 
   y2k_compliance is On). (Ilia)
+- Fixed bug #28930 (PHP sources pick wrong header files generated by bison).
+  (eggert at gnu dot org, Jani)
 
 15 Dec 2004, PHP 5.0.3
 - Added the %F modifier to *printf to render a non-locale-aware representation

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 2c7c5c492c1170882afc4e4dc1c4779526ac1cce..f1c785b49383d507434ccc812419b4bd55899017 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -19,7 +19,7 @@
 
 /* $Id$ */
 
-#include "zend_language_parser.h"
+#include <zend_language_parser.h>
 #include "zend.h"
 #include "zend_compile.h"
 #include "zend_constants.h"

diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
index dbd0fcc75d81a2a81e64da85c9422349ac59673f..cf2ddc091a5fe459ce645d4d38ae8977648d0dfc 100644 (file)
--- a/Zend/zend_highlight.c
+++ b/Zend/zend_highlight.c
@@ -20,7 +20,7 @@
 /* $Id$ */
 
 #include "zend.h"
-#include "zend_language_parser.h"
+#include <zend_language_parser.h>
 #include "zend_compile.h"
 #include "zend_highlight.h"
 #include "zend_ptr_stack.h"

diff --git a/Zend/zend_indent.c b/Zend/zend_indent.c
index 80198c8a7a9296e0ee38a03bc41c63663c84f8fa..8e120b4d6285e0755dc146996f2513e23ba1b3c5 100644 (file)
--- a/Zend/zend_indent.c
+++ b/Zend/zend_indent.c
@@ -23,7 +23,7 @@
 
 
 #include "zend.h"
-#include "zend_language_parser.h"
+#include <zend_language_parser.h>
 #include "zend_compile.h"
 #include "zend_indent.h"
 

diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index f2da5998e33c7c739d891b4de5bd7527c0d88e71..cff61343bf3d61b25514c55fff44de80da837899 100644 (file)
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include "zend.h"
 #include "zend_globals.h"
-#include "zend_ini_parser.h"
+#include <zend_ini_parser.h>
 #include "zend_ini_scanner.h"
 
 #undef YYSTYPE

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 1b96504652faf7ef98cb1e4e7b964b6322f3a04b..0cb8cd2f6d77d1f40060f652f1ddc5e52645bded 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -50,7 +50,7 @@
 #include <errno.h>
 #include "zend.h"
 #include "zend_alloc.h"
-#include "zend_language_parser.h"
+#include <zend_language_parser.h>
 #include "zend_compile.h"
 #include "zend_language_scanner.h"
 #include "zend_highlight.h"

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 32c048478022674d5f7d2a25aa28b091c137493c..6779ceea6bfa05809171e17ea6e34a6e0b4074f6 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -43,7 +43,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 
 #include "zend.h"
 #include "zend_language_scanner.h"
-#include "zend_language_parser.h"
+#include <zend_language_parser.h>
 
 #include <stdarg.h>
 #include <stdlib.h>

diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c
index 292603a7cae95dc400030f66ddb558a33bd40a1f..5c4ad3e9bc7f7fcd447c43d0afeb6b8f1dd98e1c 100644 (file)
--- a/ext/tokenizer/tokenizer.c
+++ b/ext/tokenizer/tokenizer.c
@@ -88,7 +88,7 @@ struct yy_buffer_state
 
 #include "zend.h"
 #include "zend_language_scanner.h"
-#include "zend_language_parser.h"
+#include <zend_language_parser.h>
 
 #define zendtext LANG_SCNG(yy_text)
 #define zendleng LANG_SCNG(yy_leng)