sync win32 makefile with makedist zendparse exports

With a newer bison this part is relevant. Whil bison 2.4.1 is still
used, this changes cater for the forward compatibility.

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 245643b1602003bc31c0c297d60e12c7db49b889..33f145f2694fb9f07ad05e6bbffaa9bcdf9c2dd3 100644 (file)
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -54,6 +54,9 @@ Zend\zend_ini_parser.c Zend\zend_ini_parser.h: Zend\zend_ini_parser.y
 
 Zend\zend_language_parser.c Zend\zend_language_parser.h: Zend\zend_language_parser.y
        $(BISON) --output=Zend/zend_language_parser.c -v -d -p zend Zend/zend_language_parser.y
+       @if "$(SED)" neq "" $(SED) -i "s,^int zendparse\(.*\),ZEND_API int zendparse\1,g" Zend/zend_language_parser.c
+       @if "$(SED)" neq "" $(SED) -i "s,^int zendparse\(.*\),ZEND_API int zendparse\1,g" Zend/zend_language_parser.h
+       @if "$(SED)" neq "" $(SED) -i "s,^#ifndef YYTOKENTYPE,#include \"zend.h\"\n#ifndef YYTOKENTYPE,g" Zend/zend_language_parser.h
 
 sapi\phpdbg\phpdbg_parser.c sapi\phpdbg\phpdbg_parser.h: sapi\phpdbg\phpdbg_parser.y
        $(BISON) --output=sapi/phpdbg/phpdbg_parser.c -v -d -p phpdbg_ sapi/phpdbg/phpdbg_parser.y

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 8ab4b7b0e9eb0bfc313c274d84e886d99a9c2520..e4270f705a0895421de6bcfce466079c002cbb72 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -2498,6 +2498,9 @@ function toolset_setup_project_tools()
                ERROR('bison is required')
        }
 
+       /* TODO throw error, ignore for now for BC. */
+       PATH_PROG('sed');
+
        RE2C = PATH_PROG('re2c');
        if (RE2C) {
                var intvers, intmin;