diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-06-12 09:32:06 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-06-12 09:32:06 +0000 |
| commit | 5a957e006a8271b45d8f5fa6602f1d8a7801ceb3 (patch) | |
| tree | 3217e765160d1d3aa1ba0463a270cee7c6448303 /packet-x11.c | |
| parent | 5592101b43e7810c65ff42355adafe68ae02d851 (diff) | |
| download | wireshark-5a957e006a8271b45d8f5fa6602f1d8a7801ceb3.tar.gz wireshark-5a957e006a8271b45d8f5fa6602f1d8a7801ceb3.tar.bz2 wireshark-5a957e006a8271b45d8f5fa6602f1d8a7801ceb3.zip | |
Don't include <X11/Xlib.h> to get AllPlanes defined; that causes the
build to fail on Win32 systems. It's defined (at least in the X11R6 on
my FreeBSD 3.4 system) as "((unsigned long)~0L)", which presumably means
"set all the bits" - which means "set all 32 bits" in the "value_string"
table where it appears, as the value member of an entry in such a table
is a "guint32", so just use 0xFFFFFFFF.
Get rid of other unneeded #includes as well.
svn path=/trunk/; revision=2061
Diffstat (limited to 'packet-x11.c')
| -rw-r--r-- | packet-x11.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/packet-x11.c b/packet-x11.c index 21a059814a..79e6c56274 100644 --- a/packet-x11.c +++ b/packet-x11.c @@ -2,7 +2,7 @@ * Routines for X11 dissection * Copyright 2000, Christophe Tronche <ch.tronche@computer.org> * - * $Id: packet-x11.c,v 1.2 2000/06/12 08:28:13 guy Exp $ + * $Id: packet-x11.c,v 1.3 2000/06/12 09:32:06 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -48,11 +48,8 @@ # include "config.h" #endif -#include <X11/Xlib.h> #include <assert.h> #include <ctype.h> -#include <gdk/gdk.h> -#include <gdk/gdkx.h> #include <stdio.h> #include <stdlib.h> @@ -60,19 +57,6 @@ # include <sys/types.h> #endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif - -#ifdef NEED_SNPRINTF_H -# ifdef HAVE_STDARG_H -# include <stdarg.h> -# else -# include <varargs.h> -# endif -# include "snprintf.h" -#endif - #include <string.h> #include <glib.h> #include "packet.h" @@ -510,7 +494,7 @@ static const value_string ordering_vals[] = { }; static const value_string plane_mask_vals[] = { - { AllPlanes, "AllPlanes" }, + { 0xFFFFFFFF, "AllPlanes" }, { 0, NULL } }; |