On 27 Oct 2021 06:27, Orgad Shaneh via Gdb-patches wrote:
> 1. reorder includes in sim-utils.c.
> 
> sim/mips/sim-main.h defines UserMode, while there is a struct in winnt.h
> which has UserMode as a member. So if sim-main.h is included before winnt.h,
> compilation fails.

this looks fine, and is the direction we've been taking code -- include the
standard headers first, then the sim-specific headers.  we haven't gone back
through all the files and fixed the order since it (largely) hasn't been an
issue.

> 2. pre-include winsock2.h in ppc
> 
> registers.h defines CR, which is used as a member in winnt.h.

defs.h has a very specific meaning/role in life: include config.h and that's
it.  we don't want to stuff it full of other random headers.

instead, let's find a fix similar to your sim-utils.c change.
-mike