X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fcsv.c;h=d3f9966497bebabf722d309d3a705030570f48b0;hb=64bc73f5282ec0e7da6e00a8d078191e5375dc5c;hp=d947ba2d8e8beb9586011c9f9db5765166afb466;hpb=c04cf9aa819093e51f382bf5cd28e9ef2565256f;p=libsigrok.git

diff --git a/src/output/csv.c b/src/output/csv.c
index d947ba2d..d3f99664 100644
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -21,8 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h" /* Needed for PACKAGE_STRING and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/csv"
@@ -118,8 +117,8 @@ static GString *gen_header(const struct sr_output *o)
 
 	/* Some metadata */
 	t = time(NULL);
-	g_string_append_printf(header, "; CSV, generated by %s on %s",
-			PACKAGE_STRING, ctime(&t));
+	g_string_append_printf(header, "; CSV, generated by %s %s on %s",
+			PACKAGE_NAME, SR_PACKAGE_VERSION_STRING, ctime(&t));
 
 	/* Columns / channels */
 	num_channels = g_slist_length(o->sdi->channels);
@@ -333,6 +332,7 @@ SR_PRIV struct sr_output_module output_csv = {
 	.name = "CSV",
 	.desc = "Comma-separated values",
 	.exts = (const char*[]){"csv", NULL},
+	.flags = 0,
 	.options = NULL,
 	.init = init,
 	.receive = receive,