From: Uwe Hermann Date: Tue, 3 Jan 2012 18:56:01 +0000 (+0100) Subject: sr/srd: Fix left-over #includes. X-Git-Tag: libsigrok-0.1.0~197 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=cd315a80d87a24a19a7846497d74c5ca85d494a0 sr/srd: Fix left-over #includes. The libs themselves should use #include "sigrok.h" etc., while the frontends must use #include and so on. --- diff --git a/input/input.c b/input/input.c index a7554c6a..f2d242d0 100644 --- a/input/input.c +++ b/input/input.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include +#include "sigrok.h" extern struct sr_input_format input_chronovu_la8; extern struct sr_input_format input_binary; diff --git a/input/input_binary.c b/input/input_binary.c index b83ea6f5..9d7e1560 100644 --- a/input/input_binary.c +++ b/input/input_binary.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include "sigrok.h" #define CHUNKSIZE 4096 #define DEFAULT_NUM_PROBES 8 diff --git a/input/input_chronovu_la8.c b/input/input_chronovu_la8.c index adab9226..c39f0169 100644 --- a/input/input_chronovu_la8.c +++ b/input/input_chronovu_la8.c @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include "sigrok.h" +#include "sigrok-internal.h" #define NUM_PACKETS 2048 #define PACKET_SIZE 4096 diff --git a/output/output.c b/output/output.c index d5b769da..e04b3390 100644 --- a/output/output.c +++ b/output/output.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include +#include "sigrok.h" extern struct sr_output_format output_text_bits; extern struct sr_output_format output_text_hex; diff --git a/output/output_analog.c b/output/output_analog.c index 663b8df3..5f9fcd55 100644 --- a/output/output_analog.c +++ b/output/output_analog.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include "sigrok.h" #include "config.h" #define DEFAULT_BPL_BITS 64 diff --git a/output/output_binary.c b/output/output_binary.c index 98ad3ad9..039d10bc 100644 --- a/output/output_binary.c +++ b/output/output_binary.c @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include "sigrok.h" +#include "sigrok-internal.h" #include "config.h" static int data(struct sr_output *o, const char *data_in, uint64_t length_in, diff --git a/output/output_chronovu_la8.c b/output/output_chronovu_la8.c index b97c6204..f6127352 100644 --- a/output/output_chronovu_la8.c +++ b/output/output_chronovu_la8.c @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include "sigrok.h" +#include "sigrok-internal.h" struct context { unsigned int num_enabled_probes; diff --git a/output/output_csv.c b/output/output_csv.c index 8576105a..d56a023d 100644 --- a/output/output_csv.c +++ b/output/output_csv.c @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include "sigrok.h" +#include "sigrok-internal.h" #include "config.h" struct context { diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c index dfa91eb7..39b2d2ee 100644 --- a/output/output_gnuplot.c +++ b/output/output_gnuplot.c @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include "sigrok.h" +#include "sigrok-internal.h" #include "config.h" struct context { diff --git a/output/output_ols.c b/output/output_ols.c index 5097de4b..16b288ac 100644 --- a/output/output_ols.c +++ b/output/output_ols.c @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include "sigrok.h" +#include "sigrok-internal.h" #include "config.h" struct context { diff --git a/output/output_vcd.c b/output/output_vcd.c index 509aad07..c15e9f07 100644 --- a/output/output_vcd.c +++ b/output/output_vcd.c @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include "sigrok.h" +#include "sigrok-internal.h" #include "config.h" struct context { diff --git a/output/text/ascii.c b/output/text/ascii.c index 2d0c1c36..2d6aad72 100644 --- a/output/text/ascii.c +++ b/output/text/ascii.c @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include "sigrok.h" +#include "sigrok-internal.h" #include "text.h" int init_ascii(struct sr_output *o) diff --git a/output/text/bits.c b/output/text/bits.c index 00e4d6b9..1d918184 100644 --- a/output/text/bits.c +++ b/output/text/bits.c @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include "sigrok.h" +#include "sigrok-internal.h" #include "text.h" int init_bits(struct sr_output *o) diff --git a/output/text/hex.c b/output/text/hex.c index e604d973..9c74d730 100644 --- a/output/text/hex.c +++ b/output/text/hex.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include "sigrok.h" #include "text.h" int init_hex(struct sr_output *o) diff --git a/output/text/text.c b/output/text/text.c index 6ca8983c..9cac6ed0 100644 --- a/output/text/text.c +++ b/output/text/text.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include "sigrok.h" #include "config.h" #include "text.h"