From: Frank Stettner <redacted>
Date: Wed, 23 Jun 2021 08:53:24 +0000 (+0200)
Subject: scpi_vxi: Unbreak MacOS build (vxi.h inclusion order).
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=0e3c3c80b86b7ea7590225186953ea0c4d603613;hp=020df861e0eb70dd39944d861885210ca7e7cc2a

scpi_vxi: Unbreak MacOS build (vxi.h inclusion order).

Undo the #include statement order change of commit 7414fb55cb1f. It's
essential on MacOS to include vxi.h early to keep related u_long et al
data types available. See commit d40b8557a962 for a discussion.

Also drop the inclusion of rpc/rpc.h from scpi_vxi.c because it is not
used in that source file, instead is a vxi.h dependency and is included
there.

[ gsi: rephrase commit message ]
---

diff --git a/src/scpi/scpi_vxi.c b/src/scpi/scpi_vxi.c
index 9b38efda..66e1d7db 100644
--- a/src/scpi/scpi_vxi.c
+++ b/src/scpi/scpi_vxi.c
@@ -21,12 +21,12 @@
  */
 
 #include <config.h>
-#include <rpc/rpc.h>
+/* vxi.h must the first #include after config.h See commit d40b8557. */
+#include "vxi.h"
 #include <string.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "scpi.h"
-#include "vxi.h"
 
 #define LOG_PREFIX "scpi_vxi"
 #define VXI_DEFAULT_TIMEOUT_MS 2000