diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-06-14 07:16:07 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-06-14 07:16:07 +0000 |
| commit | 9a52ba3506420bbcebae46c62c40dea4538bc5f6 (patch) | |
| tree | 436b0a98becf6fd976a34cf47de48b50c9847113 | |
| parent | 9dd3dda4c9bc748cc422453dba6758cbb8dea922 (diff) | |
When building under Win32, "boolean" appears to be defined in a fashion
that causes "packet-x11.c" to fail to compile due to it defining its own
function named "boolean", so we rename the "packet-x11.c" "boolean()"
function to "add_boolean()".
svn path=/trunk/; revision=2066
| -rw-r--r-- | packet-x11.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-x11.c b/packet-x11.c index 8d12261b79..fde73bf5f3 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.5 2000/06/14 00:24:39 guy Exp $ + * $Id: packet-x11.c,v 1.6 2000/06/14 07:16:07 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -625,7 +625,7 @@ static struct maskStruct { #define BITMASK8(name) { bitmask(hf_x11_##name##_mask, 1); } #define BITMASK16(name) { bitmask(hf_x11_##name##_mask, 2); } #define BITMASK32(name) { bitmask(hf_x11_##name##_mask, 4); } -#define BOOL(name) (boolean(#name, hf_x11_##name)) +#define BOOL(name) (add_boolean(#name, hf_x11_##name)) #define BUTTON(name) { FIELD8(name); } #define CARD8(name) { FIELD8(name); } #define CARD16(name) (FIELD16(name)) @@ -712,7 +712,7 @@ static void bitmask(int hf, int size) cur_offset += size; } -static guint32 boolean(const char *nameAsChar, int hf) +static guint32 add_boolean(const char *nameAsChar, int hf) { guint32 v = VALUE8(tvb, cur_offset); proto_tree_add_boolean(t, hf, tvb, cur_offset, 1, v); |