From: foobar <sniper@php.net>
Date: Thu, 30 Dec 2004 15:23:07 +0000 (+0000)
Subject: MFH: - Fixed bug #28930 (PHP sources pick wrong header files generated by bison).
X-Git-Tag: php-5.0.4RC1~404
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9fabbe45df9fe70702024584a707ad1c6a2e043;p=php

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

diff --git a/NEWS b/NEWS
index 00643887fd..42ad88bbdd 100644
--- 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 2c7c5c492c..f1c785b493 100644
--- 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 dbd0fcc75d..cf2ddc091a 100644
--- 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 80198c8a7a..8e120b4d62 100644
--- 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 f2da5998e3..cff61343bf 100644
--- 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 1b96504652..0cb8cd2f6d 100644
--- 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 32c0484780..6779ceea6b 100644
--- 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 292603a7ca..5c4ad3e9bc 100644
--- 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)