diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-02-05 09:42:26 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-02-05 09:42:26 +0000 |
| commit | 1b3621031843e2d9bc544174697dff374ed882d3 (patch) | |
| tree | 8129a2d527b9d7d2a834526af0c43af55ae0340d /epan/strutil.c | |
| parent | dbdea1617e286031e1b0b6f3b65312fe9dab2fef (diff) | |
| download | wireshark-1b3621031843e2d9bc544174697dff374ed882d3.tar.gz | |
We can't test the GTK+ version in dissectors or libethereal code, as
they don't include any GTK+ headers (and shouldn't do so, as they can't
use GTK+); we use the GLib version as a proxy.
svn path=/trunk/; revision=9982
Diffstat (limited to 'epan/strutil.c')
| -rw-r--r-- | epan/strutil.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/strutil.c b/epan/strutil.c index 4d8c8f8aaf..31c288aae0 100644 --- a/epan/strutil.c +++ b/epan/strutil.c @@ -1,7 +1,7 @@ /* strutil.c * String utility routines * - * $Id: strutil.c,v 1.17 2004/02/01 04:54:48 jmayer Exp $ + * $Id: strutil.c,v 1.18 2004/02/05 09:42:26 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -133,7 +133,7 @@ get_token_len(const guchar *linep, const guchar *lineend, #define INITIAL_FMTBUF_SIZE 128 -#if GTK_MAJOR_VERSION >= 2 || GTK_MINOR_VERSION >= 3 +#if GLIB_MAJOR_VERSION >= 2 /* * XXX - "isprint()" can return "true" for non-ASCII characters, but * those don't work with GTK+ 1.3 or later, as they take UTF-8 strings @@ -141,6 +141,10 @@ get_token_len(const guchar *linep, const guchar *lineend, * characters in all output (both GUI displays and text printouts) * in those versions of GTK+, we work around the problem by escaping * all characters that aren't printable ASCII. + * + * We don't know what version of GTK+ we're using, as epan doesn't + * use any GTK+ stuff; we use GLib as a proxy for that, with GLib 2.x + * implying GTK+ 1.3 or later (we don't support GLib 1.3[.x]). */ #undef isprint #define isprint(c) (c >= 0x20 && c < 0x7f) |