diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-11 20:32:19 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-11 20:32:19 +0000 |
| commit | ce4a032157322302906a2e47eb15200c6ab10975 (patch) | |
| tree | 011c39768a3be7d7d1f63d9d48d1b6e96383fdf0 /wsutil | |
| parent | b4da8264db173df69ded0b5045447b3ffa7cbbdd (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37978 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/file_util.c | 3 | ||||
| -rw-r--r-- | wsutil/file_util.h | 16 |
2 files changed, 0 insertions, 19 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; } - diff --git a/wsutil/file_util.h b/wsutil/file_util.h index 29b9343a8e..e50cf73708 100644 --- a/wsutil/file_util.h +++ b/wsutil/file_util.h @@ -52,9 +52,7 @@ extern "C" { * must tweak a given filename from UTF8 to UTF16 as we use NT Unicode (Win9x * - now unsupported - used locale based encoding here). */ -#if GLIB_CHECK_VERSION(2,6,0) -/* Win32, GLib 2.6 or later */ #include <stdio.h> extern int ws_stdio_open (const gchar *filename, int flags, int mode); @@ -76,20 +74,6 @@ extern FILE * ws_stdio_freopen (const gchar *filename, const gchar *mode, FILE * #define ws_fopen ws_stdio_fopen #define ws_freopen ws_stdio_freopen -#else /* GLIB_CHECK_VERSION(2,6,0) */ - -/* Win32, GLib prior to 2.6 */ -#define ws_open _open -#define ws_rename rename -#define ws_mkdir(dir,mode) _mkdir(dir) /* _mkdir() doesn't have a permission bits argument */ -#define ws_stat64 _stati64 /* use _stati64 for 64-bit size support */ -#define ws_unlink _unlink -#define ws_remove remove -#define ws_fopen fopen -#define ws_freopen freopen - -#endif /* GLIB_CHECK_VERSION(2,6,0) */ - /* * These routines don't take pathnames, so they're the same regardless * of what version of GLib we have. |