From d486cbddfe380de95a98646f7626426955e563ee Mon Sep 17 00:00:00 2001
From: Daniel Elstner <daniel.kitta@gmail.com>
Date: Sun, 13 Sep 2015 22:42:51 +0200
Subject: [PATCH] Build: Include <config.h> first in all source files

Since Autoconf places some important feature flags only into the
configuration header, it is necessary to include it globally to
guarantee a consistent build.
---
 anykey.c     | 1 +
 decode.c     | 2 +-
 device.c     | 2 +-
 input.c      | 2 +-
 main.c       | 1 +
 options.c    | 1 +
 parsers.c    | 1 +
 session.c    | 1 +
 show.c       | 1 +
 sigrok-cli.h | 1 -
 10 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/anykey.c b/anykey.c
index eaa53f6..7c801f1 100644
--- a/anykey.c
+++ b/anykey.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #ifdef _WIN32
 #include <windows.h>
diff --git a/decode.c b/decode.c
index e2a0f85..67d8f1e 100644
--- a/decode.c
+++ b/decode.c
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include "sigrok-cli.h"
-#include "config.h"
 
 #ifdef HAVE_SRD
 static GHashTable *pd_ann_visible = NULL;
diff --git a/device.c b/device.c
index df7a7ed..a159ff0 100644
--- a/device.c
+++ b/device.c
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <string.h>
 #include "sigrok-cli.h"
-#include "config.h"
 
 static void free_drvopts(struct sr_config *src)
 {
diff --git a/input.c b/input.c
index 79b6270..df1fdfc 100644
--- a/input.c
+++ b/input.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -26,7 +27,6 @@
 #include <string.h>
 #include <glib.h>
 #include "sigrok-cli.h"
-#include "config.h"
 
 #define BUFSIZE (16 * 1024)
 
diff --git a/main.c b/main.c
index 1706510..51053bc 100644
--- a/main.c
+++ b/main.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <glib.h>
 #include "sigrok-cli.h"
diff --git a/options.c b/options.c
index 6a97595..f2acb19 100644
--- a/options.c
+++ b/options.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include "sigrok-cli.h"
 
diff --git a/parsers.c b/parsers.c
index 333e6e4..5ec655f 100644
--- a/parsers.c
+++ b/parsers.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/session.c b/session.c
index b136dd4..6f40205 100644
--- a/session.c
+++ b/session.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <string.h>
diff --git a/show.c b/show.c
index 26ac318..e207058 100644
--- a/show.c
+++ b/show.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <string.h>
 #include "sigrok-cli.h"
diff --git a/sigrok-cli.h b/sigrok-cli.h
index 443d4f6..93a3b58 100644
--- a/sigrok-cli.h
+++ b/sigrok-cli.h
@@ -20,7 +20,6 @@
 #ifndef SIGROK_CLI_SIGROK_CLI_H
 #define SIGROK_CLI_SIGROK_CLI_H
 
-#include <config.h>
 #ifdef HAVE_SRD
 /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include <libsigrokdecode/libsigrokdecode.h>
-- 
2.30.2