osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

The CMake builds in the Ubuntu buildbot appear to be building with GTK+ 

3; if so, that might indicate that GTK+ 3 doesn't have gtkmarshal.h. 
Try not attempting to include it with GTK+ 3.x - if that causes other
failures, well, I guess that means that, when building the BytesView
widget under GTK+ 3, we can't use the gtk_marshal_ functions....

svn path=/trunk/; revision=43737
This commit is contained in:
Guy Harris 2012-07-16 01:54:32 +00:00
parent 268520b707
commit 95060ffa5d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/gtk/bytes_view.c
View File

@ -37,9 +37,11 @@
#undef GTK_DISABLE_DEPRECATED
#undef GSEAL_ENABLE
#include <gtk/gtkmarshal.h>
#include <gtk/gtk.h>
#if !GTK_CHECK_VERSION(3, 0, 0)
#include <gtk/gtkmarshal.h>
#endif
#include "ui/gtk/old-gtk-compat.h"
#include <string.h>