diff options
| author | whitequark <whitequark@whitequark.org> | 2020-12-28 02:33:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 02:33:30 +0000 |
| commit | f4a800899cd6424c852df6922628e2600a9a3978 (patch) | |
| tree | 006f7b1eeb846f63cea9da1852377f18bdea4ad6 | |
| parent | f48298347cc01d538e20dd9d86b4f795780f8f1d (diff) | |
| parent | 16c4182c74f7898ae6e3c7cbac8a29d8cc8e5510 (diff) | |
| download | yosys-f4a800899cd6424c852df6922628e2600a9a3978.tar.gz yosys-f4a800899cd6424c852df6922628e2600a9a3978.tar.bz2 yosys-f4a800899cd6424c852df6922628e2600a9a3978.zip | |
Merge pull request #2507 from umarcor/fix/msys2
kernel/yosys.h: undef CONST on WIN32
| -rw-r--r-- | kernel/yosys.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/yosys.h b/kernel/yosys.h index ac4436c52..43aecdbc8 100644 --- a/kernel/yosys.h +++ b/kernel/yosys.h @@ -121,8 +121,9 @@ extern Tcl_Obj *Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *p # define fileno _fileno # endif -// mingw and msvc include `wingdi.h` which defines a TRANSPARENT macro -// that conflicts with X(TRANSPARENT) entry in kernel/constids.inc +// The following defines conflict with our identifiers: +# undef CONST +// `wingdi.h` defines a TRANSPARENT macro that conflicts with X(TRANSPARENT) entry in kernel/constids.inc # undef TRANSPARENT #endif |