From 20a8e078cc573f85f7262f7b87be3cf8e8a6424f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 4 Dec 2021 20:24:55 -0500 Subject: sim: reorder header includes We're including system headers after local headers in a bunch of places, but this leads to conflicts when our local headers happen to define symbols that show up in the system headers. Use the more standard order of: * config.h (via defs.h) * system headers * local library headers (e.g. bfd & libiberty) * sim specific headers --- sim/common/dv-pal.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sim/common/dv-pal.c') diff --git a/sim/common/dv-pal.c b/sim/common/dv-pal.c index c60f524..3f6a95e 100644 --- a/sim/common/dv-pal.c +++ b/sim/common/dv-pal.c @@ -22,6 +22,12 @@ /* This must come before any other includes. */ #include "defs.h" +#include +#include +#ifdef HAVE_UNISTD_H +#include +#endif + #include "sim-main.h" #include "hw-main.h" #include "sim-io.h" @@ -30,12 +36,6 @@ its immediate domain */ #include "hw-tree.h" -#include -#ifdef HAVE_UNISTD_H -#include -#endif -#include - /* DEVICE -- cgit v1.1