diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-07-11 20:32:19 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-07-11 20:32:19 +0000 |
| commit | 49b92440deaabb43114479e5b0e6af2c481ca8ac (patch) | |
| tree | 011c39768a3be7d7d1f63d9d48d1b6e96383fdf0 /wsutil/file_util.c | |
| parent | 1f923105f8a5c2c7bf82f1187984600ba14ef993 (diff) | |
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
Diffstat (limited to 'wsutil/file_util.c')
| -rw-r--r-- | wsutil/file_util.c | 3 |
1 files changed, 0 insertions, 3 deletions
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; } - |