Merge pull request #2455 from tautschnig/vs-win-headers

Silence #if/#elif warnings originating from Windows header files

Author: Daniel Kroening

src/goto-cc/compile.cpp

@@ -57,11 +57,17 @@ Date: June 2006
 #endif
 
 #ifdef _WIN32
+#include <util/pragma_push.def>
+#ifdef _MSC_VER
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 #include <direct.h>
 #include <windows.h>
 #define chdir _chdir
 #define popen _popen
 #define pclose _pclose
+#include <util/pragma_pop.def>
 #endif
 
 /// reads and source and object files, compiles and links them into goto program

src/util/cout_message.cpp

@@ -11,10 +11,16 @@ Author: Daniel Kroening, [email protected]
 #include <iostream>
 
 #ifdef _WIN32
+#include <util/pragma_push.def>
+#ifdef _MSC_VER
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 #include <windows.h>
 #include <fcntl.h>
 #include <io.h>
 #include <cstdio>
+#include <util/pragma_pop.def>
 #endif
 
 #include "unicode.h"

src/util/file_util.cpp

@@ -32,13 +32,19 @@ Date: January 2012
 #endif
 
 #ifdef _WIN32
+#include <util/pragma_push.def>
+#ifdef _MSC_VER
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 #include <io.h>
 #include <windows.h>
 #include <direct.h>
 #include <util/unicode.h>
 #define chdir _chdir
 #define popen _popen
 #define pclose _pclose
+#include <util/pragma_pop.def>
 #endif
 
 /// \return current working directory

src/util/memory_info.cpp

@@ -19,8 +19,14 @@ Author: Daniel Kroening, [email protected]
 #endif
 
 #ifdef _WIN32
+#include <util/pragma_push.def>
+#ifdef _MSC_VER
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 #include <windows.h>
 #include <psapi.h>
+#include <util/pragma_pop.def>
 #endif
 
 #include <ostream>

src/util/tempdir.cpp

@@ -9,9 +9,15 @@ Author: CM Wintersteiger
 #include "tempdir.h"
 
 #ifdef _WIN32
+#include <util/pragma_push.def>
+#ifdef _MSC_VER
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 #include <windows.h>
 #include <io.h>
 #include <direct.h>
+#include <util/pragma_pop.def>
 #endif
 
 #include <cstdlib>

src/util/tempfile.cpp

@@ -9,6 +9,11 @@ Author: Daniel Kroening
 #include "tempfile.h"
 
 #ifdef _WIN32
+#include <util/pragma_push.def>
+#ifdef _MSC_VER
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 #include <process.h>
 #include <sys/stat.h>
 #include <windows.h>
@@ -17,6 +22,7 @@ Author: Daniel Kroening
 #define getpid _getpid
 #define open _open
 #define close _close
+#include <util/pragma_pop.def>
 #endif
 
 #include <fcntl.h>

src/util/unicode.cpp

@@ -15,7 +15,13 @@ Author: Daniel Kroening, [email protected]
 #include <cstdint>
 
 #ifdef _WIN32
+#include <util/pragma_push.def>
+#ifdef _MSC_VER
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 #include <windows.h>
+#include <util/pragma_pop.def>
 #endif
 
 std::string narrow(const wchar_t *s)