From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 16 Dec 2021 07:25:21 +0000 (-0500)
Subject: sim: fix mingw builds with replacement gnulib open
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4095db4c9ced51193a218ff57ecd81f5be95b05e;p=binutils-gdb.git

sim: fix mingw builds with replacement gnulib open

The header shuffling in here broke the workaround for gnulib defining
"open".  Move it back before the sim-specific includes to fix.  This
is because the callback struct in the headers has an "open" member and
this file tries to call that.
---

diff --git a/sim/common/sim-io.c b/sim/common/sim-io.c
index 8c40f7a0e73..874f6423e83 100644
--- a/sim/common/sim-io.c
+++ b/sim/common/sim-io.c
@@ -33,12 +33,12 @@
 #include <unistd.h>
 #endif
 
+#undef open
+
 #include "sim-main.h"
 #include "sim-io.h"
 #include "sim/callback.h"
 
-#undef open
-
 /* Define the rate at which the simulator should poll the host
    for a quit. */
 #ifndef POLL_QUIT_INTERVAL