Skip to content

Commit

Permalink
Various #include file cosmetic fixes.
Browse files Browse the repository at this point in the history
Generally include system headers before local headers, unless there's
a technical reason to use another order.
  • Loading branch information
uwehermann committed Mar 26, 2015
1 parent 3d24ca2 commit 662a1e2
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion anykey.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "sigrok-cli.h"
#include <stdio.h>
#ifdef _WIN32
#include <windows.h>
Expand All @@ -27,6 +26,7 @@
#include <unistd.h>
#include <string.h>
#include <glib.h>
#include "sigrok-cli.h"

#ifdef _WIN32
static HANDLE stdin_handle;
Expand Down
4 changes: 2 additions & 2 deletions decode.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
* 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 "sigrok-cli.h"
#include "config.h"

#ifdef HAVE_SRD
static GHashTable *pd_ann_visible = NULL;
Expand Down
4 changes: 2 additions & 2 deletions device.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
* 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 "sigrok-cli.h"
#include "config.h"

extern struct sr_context *sr_ctx;

Expand Down
4 changes: 2 additions & 2 deletions input.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
* 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>
Expand All @@ -27,6 +25,8 @@
#include <stdlib.h>
#include <string.h>
#include <glib.h>
#include "sigrok-cli.h"
#include "config.h"

#define BUFSIZE (16 * 1024)

Expand Down
2 changes: 1 addition & 1 deletion main.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "sigrok-cli.h"
#include <stdlib.h>
#include <glib.h>
#include "sigrok-cli.h"

struct sr_context *sr_ctx = NULL;
#ifdef HAVE_SRD
Expand Down
2 changes: 1 addition & 1 deletion options.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "sigrok-cli.h"
#include <glib.h>
#include "sigrok-cli.h"

gboolean opt_version = FALSE;
gint opt_loglevel = SR_LOG_WARN; /* Show errors+warnings by default. */
Expand Down
2 changes: 1 addition & 1 deletion parsers.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
* 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 "sigrok-cli.h"

extern struct sr_context *sr_ctx;

Expand Down
2 changes: 1 addition & 1 deletion session.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
* 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 "sigrok-cli.h"

static uint64_t limit_samples = 0;
static uint64_t limit_frames = 0;
Expand Down
2 changes: 1 addition & 1 deletion show.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "sigrok-cli.h"
#include <glib.h>
#include <string.h>
#include "sigrok-cli.h"

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

0 comments on commit 662a1e2

Please sign in to comment.