From 2872d21ebc4e9554f685551e4915f193357f13d9 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Tue, 8 Feb 2011 17:50:29 +0100
Subject: [PATCH] Add sr_ prefix for 'struct session'.

---
 session.c      | 6 +++---
 session_file.c | 4 ++--
 sigrok-proto.h | 2 +-
 sigrok.h       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/session.c b/session.c
index 77326291..e4f3921b 100644
--- a/session.c
+++ b/session.c
@@ -37,16 +37,16 @@ struct source {
 };
 
 /* There can only be one session at a time. */
-struct session *session;
+struct sr_session *session;
 int num_sources = 0;
 
 struct source *sources = NULL;
 int source_timeout = -1;
 
 
-struct session *session_new(void)
+struct sr_session *session_new(void)
 {
-	session = calloc(1, sizeof(struct session));
+	session = calloc(1, sizeof(struct sr_session));
 
 	return session;
 }
diff --git a/session_file.c b/session_file.c
index 2a727c86..bd3548ab 100644
--- a/session_file.c
+++ b/session_file.c
@@ -26,7 +26,7 @@
 #include <glib/gstdio.h>
 #include <sigrok.h>
 
-extern struct session *session;
+extern struct sr_session *session;
 extern struct sr_device_plugin session_driver;
 
 
@@ -37,7 +37,7 @@ int session_load(const char *filename)
 	struct zip *archive;
 	struct zip_file *zf;
 	struct zip_stat zs;
-	struct session *session;
+	struct sr_session *session;
 	struct sr_device *device;
 	struct sr_probe *probe;
 	int ret, err, probenum, devcnt, i, j;
diff --git a/sigrok-proto.h b/sigrok-proto.h
index c0d09da5..8dfe2db1 100644
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -98,7 +98,7 @@ typedef void (*datafeed_callback) (struct sr_device *device,
 
 /* Session setup */
 int session_load(const char *filename);
-struct session *session_new(void);
+struct sr_session *session_new(void);
 void session_destroy(void);
 void session_device_clear(void);
 int session_device_add(struct sr_device *device);
diff --git a/sigrok.h b/sigrok.h
index 9518041c..9a5d0cbe 100644
--- a/sigrok.h
+++ b/sigrok.h
@@ -340,7 +340,7 @@ struct sr_device_plugin {
 	void (*stop_acquisition) (int device_index, gpointer session_device_id);
 };
 
-struct session {
+struct sr_session {
 	/* List of struct sr_device* */
 	GSList *devices;
 	/* List of struct analyzer* */