From 712eca44d5121dcf62031753e066e3fb6dc66492 Mon Sep 17 00:00:00 2001
From: Vlad Vissoultchev <wqweto@gmail.com>
Date: Mon, 14 Mar 2016 18:06:42 +0200
Subject: [PATCH] Revert spawnvp param cast and use
 `no-incompatible-pointer-types` in build-tcc.bat

---
 tcc.c               | 2 +-
 win32/build-tcc.bat | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tcc.c b/tcc.c
index 32c966e9..9daf6e66 100644
--- a/tcc.c
+++ b/tcc.c
@@ -132,7 +132,7 @@ static void help(void)
 #include <process.h>
 static int execvp_win32(const char *prog, char **argv)
 {
-    int ret = spawnvp(P_NOWAIT, prog, (char *const*)argv);
+    int ret = spawnvp(P_NOWAIT, prog, (const char *const*)argv);
     if (-1 == ret)
         return ret;
     cwait(&ret, ret, WAIT_CHILD);
diff --git a/win32/build-tcc.bat b/win32/build-tcc.bat
index ec8d5aef..7713e69d 100644
--- a/win32/build-tcc.bat
+++ b/win32/build-tcc.bat
@@ -10,14 +10,14 @@ echo>..\config.h #define TCC_VERSION "%VERSION%"
 @if _%1_==_x64_ shift /1 && goto x86_64
 
 @set target=-DTCC_TARGET_PE -DTCC_TARGET_I386
-@set CC=gcc -Os -s -fno-strict-aliasing
+@set CC=gcc -Os -s -fno-strict-aliasing -Wno-incompatible-pointer-types
 @if _%1_==_debug_ set CC=gcc -g -ggdb
 @set P=32
 @goto tools
 
 :x86_64
 @set target=-DTCC_TARGET_PE -DTCC_TARGET_X86_64
-@set CC=x86_64-w64-mingw32-gcc -Os -s -fno-strict-aliasing
+@set CC=x86_64-w64-mingw32-gcc -Os -s -fno-strict-aliasing -Wno-incompatible-pointer-types
 @if _%1_==_debug_ set CC=x86_64-w64-mingw32-gcc -g -ggdb
 @set P=64
 @goto tools