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.h | |
| 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.h')
| -rw-r--r-- | wsutil/file_util.h | 16 |
1 files changed, 0 insertions, 16 deletions
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. |