Skip to content

Commit 7a903fb

Browse files
committed
Merge branch 'judemille-windows-compat-fixes'
Added an undef of interface, a microsoft preprocessor symbol (conflicts with libdwrf). In dwarfgen. refinded a _WIN32 defined test to check __MSC_VER too.
2 parents da297e9 + 9944cb5 commit 7a903fb

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/bin/dwarfgen/createirepformfrombinary.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@
6262
#include "irepresentation.h"
6363
#include "createirepfrombinary.h"
6464

65+
// Microsoft preprocessor definition that wreaks havoc
66+
#ifdef interface
67+
#undef interface
68+
#endif
69+
6570
using std::string;
6671
using std::cout;
6772
using std::cerr;

src/lib/libdwarf/libdwarf_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define LIBDWARF_PRIVATE_H
1212
#define DW_PR_XZEROS "08"
1313

14-
#ifdef _WIN32
14+
#if defined(_WIN32) && defined(_MSC_VER)
1515
#define DW_PR_DUx "I64x"
1616
#define DW_PR_DSx "I64x"
1717
#define DW_PR_DUu "I64u"

0 commit comments

Comments
 (0)