Fix popen redef error and remove old mingw as it doesn't have popen.

bfgroup · Mar 26, 2019 · c7c1d19 · c7c1d19
1 parent e50286f
commit c7c1d19
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -22,12 +22,7 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
     TEST_TOOLSET: msvc
   - TOOLSET: mingw
-    CXX: C:\MinGW\bin\g++.exe
-    TEST_TOOLSET: gcc
-    CXX_PATH: C:\MinGW\bin
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-  - TOOLSET: mingw
-    CXX: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw64\bin\g++.exe
+    CXX: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin\g++.exe
     TEST_TOOLSET: gcc
     CXX_PATH: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw64\bin
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015

diff --git a/src/engine/builtins.c b/src/engine/builtins.c
@@ -2410,7 +2410,9 @@ PyObject * bjam_caller( PyObject * self, PyObject * args )
 #ifdef HAVE_POPEN
 
 #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW64__) || defined(__MINGW32__)
+    #undef popen
     #define popen windows_popen_wrapper
+    #undef pclose
     #define pclose _pclose
 
     /*