diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-11-17 04:15:01 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-11-17 04:15:01 +0000 |
| commit | 378ebd81a6e9a57616b15021db2f13552fbe9e3b (patch) | |
| tree | 4ee2c09fbb09209ff5a5192b1bf1f87aaa19fc06 /epan/strutil.h | |
| parent | ff10d1c2179739f894abc180bf989f0897d70850 (diff) | |
| download | wireshark-378ebd81a6e9a57616b15021db2f13552fbe9e3b.tar.gz wireshark-378ebd81a6e9a57616b15021db2f13552fbe9e3b.tar.bz2 wireshark-378ebd81a6e9a57616b15021db2f13552fbe9e3b.zip | |
g_strlcat() and g_ascii_isprint() don't exist in GTK+ at all - they
exist in GLib 2.x, but not in 1.2[.x]. Check the version number of
GLIB, not of GTK+, to decide whether to #define them.
svn path=/trunk/; revision=16522
Diffstat (limited to 'epan/strutil.h')
| -rw-r--r-- | epan/strutil.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/strutil.h b/epan/strutil.h index 8d4420ed96..9e8c632a09 100644 --- a/epan/strutil.h +++ b/epan/strutil.h @@ -144,8 +144,8 @@ guint8 * convert_string_to_hex(const char *string, size_t *nbytes); */ char * convert_string_case(const char *string, gboolean case_insensitive); -/* g_strlcat() does not exist in gtk 1 */ -#if GTK_MAJOR_VERSION < 2 +/* g_strlcat() does not exist in GLib 1.2[.x] */ +#if GLIB_MAJOR_VERSION < 2 #define g_strlcat(dst, src, size) \ { \ int strl; \ @@ -156,10 +156,10 @@ char * convert_string_case(const char *string, gboolean case_insensitive); } #endif -/* g_ascii_isprint() does not exist in gtk 1 - * assume all codes >=0x20 and <0x80 are ascii printables. +/* g_ascii_isprint() does not exist in GLib 1.2[.x]. + * assume all codes >=0x20 and <0x80 are ASCII printables. */ -#if GTK_MAJOR_VERSION < 2 +#if GLIB_MAJOR_VERSION < 2 #define g_ascii_isprint(c) \ (((c<0x20)||(c>=0x80))?FALSE:TRUE) #endif |