Various #include file cosmetic fixes.

Generally include system headers before local headers, unless there's
a technical reason to use another order.

diff --git a/anykey.c b/anykey.c
index 893358616fa6ba992274a8e2fdb324e33241abc8..eaa53f627aeb2af08243316bf64c478861448e34 100644 (file)
--- a/anykey.c
+++ b/anykey.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include "sigrok-cli.h"

 #include <stdio.h>
 #ifdef _WIN32
 #include <windows.h>
 #include <stdio.h>
 #ifdef _WIN32
 #include <windows.h>


@@ -27,6 +26,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>

+#include "sigrok-cli.h"

 
 #ifdef _WIN32
 static HANDLE stdin_handle;
 
 #ifdef _WIN32
 static HANDLE stdin_handle;

diff --git a/decode.c b/decode.c
index 09b43f93d3b48c4da38f90505c141ea8823c26a1..cadd5ea74807092a6e2e1ec652403057f7b04db8 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include "sigrok-cli.h"
-#include "config.h"

 #include <stdlib.h>
 #include <string.h>
 #include <glib.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;
 
 #ifdef HAVE_SRD
 static GHashTable *pd_ann_visible = NULL;

diff --git a/device.c b/device.c
index 48646b5933de9cce80ef752976a22b7fa3281484..17505e26a59e60a44b7b7e50f3db8f3630499759 100644 (file)
--- a/device.c
+++ b/device.c
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include "sigrok-cli.h"
-#include "config.h"

 #include <glib.h>
 #include <string.h>
 #include <glib.h>
 #include <string.h>

+#include "sigrok-cli.h"
+#include "config.h"

 
 extern struct sr_context *sr_ctx;
 
 
 extern struct sr_context *sr_ctx;
 

diff --git a/input.c b/input.c
index a0b054af337aa2c83d284b17ab707f6c59a0e2f2..79b6270158b318e0d0f77cdaa984f8fac464bbb9 100644 (file)
--- a/input.c
+++ b/input.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include "sigrok-cli.h"
-#include "config.h"

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>


@@ -27,6 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

+#include "sigrok-cli.h"
+#include "config.h"

 
 #define BUFSIZE (16 * 1024)
 
 
 #define BUFSIZE (16 * 1024)
 

diff --git a/main.c b/main.c
index 4f2ff3ce6566d8421f14217f025e5eb12f929497..a53566e8960b31b24ce3b89e6e68edd5b62e841d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include "sigrok-cli.h"

 #include <stdlib.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <glib.h>

+#include "sigrok-cli.h"

 
 struct sr_context *sr_ctx = NULL;
 #ifdef HAVE_SRD
 
 struct sr_context *sr_ctx = NULL;
 #ifdef HAVE_SRD

diff --git a/options.c b/options.c
index 32787e5a227f4b763a28fdb51e942c04fb5b9417..6a97595740bfc51e2fa44d176982df2da3a3ced4 100644 (file)
--- a/options.c
+++ b/options.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include "sigrok-cli.h"

 #include <glib.h>
 #include <glib.h>

+#include "sigrok-cli.h"

 
 gboolean opt_version = FALSE;
 gint opt_loglevel = SR_LOG_WARN; /* Show errors+warnings by default. */
 
 gboolean opt_version = FALSE;
 gint opt_loglevel = SR_LOG_WARN; /* Show errors+warnings by default. */

diff --git a/parsers.c b/parsers.c
index f0e2a7f8ebccb10073a44ecb8968e0a008336294..f7d03bc6bbf230d9af2247b11ecf1fd43755e27d 100644 (file)
--- a/parsers.c
+++ b/parsers.c
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include "sigrok-cli.h"

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>

+#include "sigrok-cli.h"

 
 extern struct sr_context *sr_ctx;
 
 
 extern struct sr_context *sr_ctx;
 

diff --git a/session.c b/session.c
index 983d4841af7e3a2cce5960d85ac7dad72b3406ec..30e08252fe6543b94a266fe92b708332bfe01f17 100644 (file)
--- a/session.c
+++ b/session.c
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include "sigrok-cli.h"

 #include <glib.h>
 #include <glib/gstdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <string.h>
 #include <stdlib.h>

+#include "sigrok-cli.h"

 
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
 
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;

diff --git a/show.c b/show.c
index f0dbbf4ab89421d240e1c209cb9b4f77b144375d..88a272f3855c7636496c90f616ccc6d3efe1d7aa 100644 (file)
--- a/show.c
+++ b/show.c
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include "sigrok-cli.h"

 #include <glib.h>
 #include <string.h>
 #include <glib.h>
 #include <string.h>

+#include "sigrok-cli.h"

 
 static gint sort_inputs(gconstpointer a, gconstpointer b)
 {
 
 static gint sort_inputs(gconstpointer a, gconstpointer b)
 {