X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput.c;h=6664ed724f21d91e717c1a09be855d066c301380;hb=120b259ea8f17b74deca3ba4b71e78771539bde8;hp=6f07352b1ab7d79f273fcfe7edc01225c5f2c879;hpb=6eb0e3ea9528e91ef1e44e224fe9d6b05e31596f;p=libsigrok.git

diff --git a/output/output.c b/output/output.c
index 6f07352b..6664ed72 100644
--- a/output/output.c
+++ b/output/output.c
@@ -19,16 +19,17 @@
 
 #include <sigrok.h>
 
-extern struct output_format output_text_bits;
-extern struct output_format output_text_hex;
-extern struct output_format output_text_ascii;
-extern struct output_format output_binary;
-extern struct output_format output_vcd;
-extern struct output_format output_ols;
-extern struct output_format output_gnuplot;
-extern struct output_format output_analog_bits;
+extern struct sr_output_format output_text_bits;
+extern struct sr_output_format output_text_hex;
+extern struct sr_output_format output_text_ascii;
+extern struct sr_output_format output_binary;
+extern struct sr_output_format output_vcd;
+extern struct sr_output_format output_ols;
+extern struct sr_output_format output_gnuplot;
+/* extern struct sr_output_format output_analog_bits; */
+/* extern struct sr_output_format output_analog_gnuplot; */
 
-struct output_format *output_module_list[] = {
+static struct sr_output_format *output_module_list[] = {
 	&output_text_bits,
 	&output_text_hex,
 	&output_text_ascii,
@@ -36,11 +37,12 @@ struct output_format *output_module_list[] = {
 	&output_vcd,
 	&output_ols,
 	&output_gnuplot,
-	&output_analog_bits,
+	/* &output_analog_bits, */
+	/* &output_analog_gnuplot, */
 	NULL,
 };
 
-struct output_format **output_list(void)
+struct sr_output_format **sr_output_list(void)
 {
 	return output_module_list;
 }