From: Anatol Belski <ab@php.net>
Date: Thu, 29 Sep 2016 10:56:49 +0000 (+0200)
Subject: sync win32 makefile with makedist zendparse exports
X-Git-Tag: php-7.1.0RC4~112^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62bed405da99806aa94991ef0b933a1c41878aa5;p=php

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 245643b160..33f145f269 100644
--- 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 8ab4b7b0e9..e4270f705a 100644
--- 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;