From 49b92440deaabb43114479e5b0e6af2c481ca8ac Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Mon, 11 Jul 2011 20:32:19 +0000 Subject: More GLIB_CHECK_VERSION cleanups. Update the minimum GLib/GTK+ versions in README.devloper. Remove g_gnuc.h since it's no longer needed. Remove tvbuff_init(), tvbuff_cleanup(), reassemble_init(), and reassemble_cleanup() since they were only used for older GLib versions which didn't support GSlices. Assume we always support the "matches" operator. svn path=/trunk/; revision=37978 --- wsutil/file_util.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'wsutil/file_util.c') diff --git a/wsutil/file_util.c b/wsutil/file_util.c index 47b8deff1a..d44c30ba67 100644 --- a/wsutil/file_util.c +++ b/wsutil/file_util.c @@ -594,7 +594,6 @@ getenv_utf8(const char *varname) envvar = getenv(varname); /* since GLib 2.6 we need an utf8 version of the filename */ -#if GLIB_CHECK_VERSION(2,6,0) /* using the wide char version of getenv should work under all circumstances */ /* convert given varname to utf16, needed by _wgetenv */ @@ -613,8 +612,6 @@ getenv_utf8(const char *varname) /* convert value to utf8 */ envvar = g_utf16_to_utf8(envvarw, -1, NULL, NULL, NULL); /* XXX - memleak */ -#endif return envvar; } - -- cgit v1.2.3