diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-06-16 00:53:20 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-06-16 00:53:20 +0000 |
| commit | 3a407d9567a2443401eef9445cb1e228dd02008b (patch) | |
| tree | de35242e1888899aa25b343c56bc89a5616a7eca /prefs-int.h | |
| parent | 561aaa66e05e2eff2ccd4cb38488b1023aa032c6 (diff) | |
| download | wireshark-3a407d9567a2443401eef9445cb1e228dd02008b.tar.gz wireshark-3a407d9567a2443401eef9445cb1e228dd02008b.tar.bz2 wireshark-3a407d9567a2443401eef9445cb1e228dd02008b.zip | |
From Chris Waters: don't use "bool" as a variable name or structure
member, as it's a C++ keyword.
svn path=/trunk/; revision=5677
Diffstat (limited to 'prefs-int.h')
| -rw-r--r-- | prefs-int.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/prefs-int.h b/prefs-int.h index b5227c4f4c..390895d08c 100644 --- a/prefs-int.h +++ b/prefs-int.h @@ -2,7 +2,7 @@ * Definitions for implementation of preference handling routines; * used by "friends" of the preferences type. * - * $Id: prefs-int.h,v 1.6 2002/05/25 01:47:46 guy Exp $ + * $Id: prefs-int.h,v 1.7 2002/06/16 00:53:17 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -57,13 +57,13 @@ struct preference { pref_type_t type; /* type of that preference */ union { guint *uint; - gboolean *bool; + gboolean *boolean; gint *enump; char **string; } varp; /* pointer to variable storing the value */ union { guint uint; - gboolean bool; + gboolean boolean; gint enumval; char *string; } saved_val; /* original value, when editing from the GUI */ |