mirror of
https://github.com/YosysHQ/yosys
synced 2025-04-11 03:33:36 +00:00
Merge pull request #2164 from madebr/msvc
Get yosys building on Visual Studio
This commit is contained in:
commit
2123019ac6
|
@ -591,7 +591,7 @@ read_define_args()
|
|||
|
||||
default:
|
||||
// The only FSM states are 0-2 and we dealt with 2 at the start of the loop.
|
||||
__builtin_unreachable();
|
||||
log_assert(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1481,7 +1481,7 @@ enum_name_decl:
|
|||
delete $1;
|
||||
SET_AST_NODE_LOC(node, @1, @1);
|
||||
delete node->children[0];
|
||||
node->children[0] = $2 ?: new AstNode(AST_NONE);
|
||||
node->children[0] = $2 ? $2 : new AstNode(AST_NONE);
|
||||
astbuf2->children.push_back(node);
|
||||
}
|
||||
;
|
||||
|
|
|
@ -117,11 +117,11 @@ extern Tcl_Obj *Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *p
|
|||
# define PATH_MAX MAX_PATH
|
||||
# define isatty _isatty
|
||||
# define fileno _fileno
|
||||
# else
|
||||
// mingw includes `wingdi.h` which defines a TRANSPARENT macro
|
||||
// that conflicts with X(TRANSPARENT) entry in kernel/constids.inc
|
||||
# undef TRANSPARENT
|
||||
# endif
|
||||
|
||||
// mingw and msvc include `wingdi.h` which defines a TRANSPARENT macro
|
||||
// that conflicts with X(TRANSPARENT) entry in kernel/constids.inc
|
||||
# undef TRANSPARENT
|
||||
#endif
|
||||
|
||||
#ifndef PATH_MAX
|
||||
|
|
|
@ -795,11 +795,11 @@ struct ExtractCounterPass : public Pass {
|
|||
pool<RTLIL::IdString> _parallel_cells;
|
||||
CounterExtractionSettings settings
|
||||
{
|
||||
.parallel_cells = _parallel_cells,
|
||||
.maxwidth = 64,
|
||||
.minwidth = 2,
|
||||
.allow_arst = true,
|
||||
.allowed_dirs = 0,
|
||||
_parallel_cells, // parallel_cells
|
||||
64, // maxwidth
|
||||
2, // minwidth
|
||||
true, // allow_arst
|
||||
0, // allowed_dirs
|
||||
};
|
||||
|
||||
size_t argidx;
|
||||
|
|
Loading…
Reference in a new issue