Skip to content

Commit 6cb461c

Browse files
committed
Silence #if/#elif warnings originating from Windows header files
1 parent 5e5e264 commit 6cb461c

File tree

7 files changed

+42
-0
lines changed

7 files changed

+42
-0
lines changed

src/goto-cc/compile.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,17 @@ Date: June 2006
5656
#endif
5757

5858
#ifdef _WIN32
59+
#include <util/pragma_push.def>
60+
#ifdef _MSC_VER
61+
#pragma warning(disable:4668)
62+
// using #if/#elif on undefined macro
63+
#endif
5964
#include <direct.h>
6065
#include <windows.h>
6166
#define chdir _chdir
6267
#define popen _popen
6368
#define pclose _pclose
69+
#include <util/pragma_pop.def>
6470
#endif
6571

6672
#include "version.h"

src/util/cout_message.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,16 @@ Author: Daniel Kroening, kroening@kroening.com
1111
#include <iostream>
1212

1313
#ifdef _WIN32
14+
#include <util/pragma_push.def>
15+
#ifdef _MSC_VER
16+
#pragma warning(disable:4668)
17+
// using #if/#elif on undefined macro
18+
#endif
1419
#include <windows.h>
1520
#include <fcntl.h>
1621
#include <io.h>
1722
#include <cstdio>
23+
#include <util/pragma_pop.def>
1824
#endif
1925

2026
#include "unicode.h"

src/util/file_util.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,19 @@ Date: January 2012
3232
#endif
3333

3434
#ifdef _WIN32
35+
#include <util/pragma_push.def>
36+
#ifdef _MSC_VER
37+
#pragma warning(disable:4668)
38+
// using #if/#elif on undefined macro
39+
#endif
3540
#include <io.h>
3641
#include <windows.h>
3742
#include <direct.h>
3843
#include <util/unicode.h>
3944
#define chdir _chdir
4045
#define popen _popen
4146
#define pclose _pclose
47+
#include <util/pragma_pop.def>
4248
#endif
4349

4450
/// \return current working directory

src/util/memory_info.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,14 @@ Author: Daniel Kroening, kroening@kroening.com
1919
#endif
2020

2121
#ifdef _WIN32
22+
#include <util/pragma_push.def>
23+
#ifdef _MSC_VER
24+
#pragma warning(disable:4668)
25+
// using #if/#elif on undefined macro
26+
#endif
2227
#include <windows.h>
2328
#include <psapi.h>
29+
#include <util/pragma_pop.def>
2430
#endif
2531

2632
#include <ostream>

src/util/tempdir.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@ Author: CM Wintersteiger
99
#include "tempdir.h"
1010

1111
#ifdef _WIN32
12+
#include <util/pragma_push.def>
13+
#ifdef _MSC_VER
14+
#pragma warning(disable:4668)
15+
// using #if/#elif on undefined macro
16+
#endif
1217
#include <windows.h>
1318
#include <io.h>
1419
#include <direct.h>
20+
#include <util/pragma_pop.def>
1521
#endif
1622

1723
#include <cstdlib>

src/util/tempfile.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ Author: Daniel Kroening
99
#include "tempfile.h"
1010

1111
#ifdef _WIN32
12+
#include <util/pragma_push.def>
13+
#ifdef _MSC_VER
14+
#pragma warning(disable:4668)
15+
// using #if/#elif on undefined macro
16+
#endif
1217
#include <process.h>
1318
#include <sys/stat.h>
1419
#include <windows.h>
@@ -17,6 +22,7 @@ Author: Daniel Kroening
1722
#define getpid _getpid
1823
#define open _open
1924
#define close _close
25+
#include <util/pragma_pop.def>
2026
#endif
2127

2228
#include <fcntl.h>

src/util/unicode.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@ Author: Daniel Kroening, kroening@kroening.com
1515
#include <cstdint>
1616

1717
#ifdef _WIN32
18+
#include <util/pragma_push.def>
19+
#ifdef _MSC_VER
20+
#pragma warning(disable:4668)
21+
// using #if/#elif on undefined macro
22+
#endif
1823
#include <windows.h>
24+
#include <util/pragma_pop.def>
1925
#endif
2026

2127
/// Determine endianness of the architecture

0 commit comments

Comments
 (0)