diff options
| author | Guy Harris <guy@alum.mit.edu> | 2008-04-29 08:44:57 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2008-04-29 08:44:57 +0000 |
| commit | 1ad79116edf6912f59ec46072e0fb408d652bd42 (patch) | |
| tree | 1a2dc751e6e3d84dfa41c0122c456afac78ee159 /epan/strutil.h | |
| parent | d136d9325208565fb8989ab2b038317aa6efdaea (diff) | |
| download | wireshark-1ad79116edf6912f59ec46072e0fb408d652bd42.tar.gz | |
Get rid of old GLib 1.2[.x] stuff, as we now require GLib 2.x.
svn path=/trunk/; revision=25192
Diffstat (limited to 'epan/strutil.h')
| -rw-r--r-- | epan/strutil.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/epan/strutil.h b/epan/strutil.h index 506bed2b3d..8b12ee5059 100644 --- a/epan/strutil.h +++ b/epan/strutil.h @@ -215,29 +215,4 @@ char * convert_string_case(const char *string, gboolean case_insensitive); */ char * epan_strcasestr(const char *haystack, const char *needle); -/* g_strlcat() does not exist in GLib 1.2[.x] */ -#if GLIB_MAJOR_VERSION < 2 -gsize g_strlcat(gchar *dst, const gchar *src, gsize size); -gsize g_strlcpy(gchar *dest, const gchar *src, gsize dest_size); -#endif - -#if GLIB_MAJOR_VERSION < 2 -/* g_ascii_isprint() does not exist in GLib 1.2[.x]. - * assume all codes >=0x20 and <0x80 are ASCII printables. - */ -#define g_ascii_isprint(c) \ - (((c<0x20)||(c>=0x80))?FALSE:TRUE) -/* g_ascii_isxdigit() does not exist in Glib 1.2 */ -#define g_ascii_isxdigit(c) \ - ( ((c>='0')&&(c<='9'))?TRUE: \ - ( ((c>='a')&&(c<='f'))?TRUE: \ - (((c>='A')&&(c<='F'))?TRUE:FALSE) ) ) - -#endif - -#if GLIB_MAJOR_VERSION < 2 -/* g_byte_array_sized_new() doesnt exist in glib-1.2 */ -GByteArray *g_byte_array_sized_new(guint reserved_size); -#endif - #endif /* __STRUTIL_H__ */ |