X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=sigview.c;h=68886989846c5e146cb49e30fd3d973fc77d5e73;hb=c82143e6806703f739597adec1cf14aff08a1a6e;hp=4863e7fa8d19b2aff99fda8d5f7bb3743e35afc9;hpb=3f63165cbcd9e3e512a7f117a025c406147b0466;p=sigrok-gtk.git

diff --git a/sigview.c b/sigview.c
index 4863e7f..6888698 100644
--- a/sigview.c
+++ b/sigview.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <sigrok.h>
+#include <libsigrok/libsigrok.h>
 #include <gtk/gtk.h>
 
 #include <string.h>
@@ -30,14 +30,14 @@
 GtkListStore *siglist;
 
 static void format_func(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
-		GtkTreeModel *siglist, GtkTreeIter *iter, gpointer user_data)
+		GtkTreeModel *siglist, GtkTreeIter *iter, gpointer cb_data)
 {
 	int probe;
 	char *colour;
 	GArray *data;
 
 	(void)tree_column;
-	(void)user_data;
+	(void)cb_data;
 
 	/* TODO: In future we will get data here from tree model.
 	 * PD data streams will be kept in the list.  The logic stream