diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-07-16 01:54:32 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-07-16 01:54:32 +0000 |
| commit | 95060ffa5d824cc7bf14e5899f716fd4404f5e47 (patch) | |
| tree | 64d5b33d23929029675f33bf39cdc96ac5546f67 /ui/gtk/bytes_view.c | |
| parent | 268520b707fc41c6a7d97955ed3a7617137f8835 (diff) | |
| download | wireshark-95060ffa5d824cc7bf14e5899f716fd4404f5e47.tar.gz | |
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
Diffstat (limited to 'ui/gtk/bytes_view.c')
| -rw-r--r-- | ui/gtk/bytes_view.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/gtk/bytes_view.c b/ui/gtk/bytes_view.c index d8487d9927..73750d20ae 100644 --- a/ui/gtk/bytes_view.c +++ b/ui/gtk/bytes_view.c @@ -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> |