diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-04-09 04:57:47 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-04-09 04:57:47 +0000 |
| commit | e1cc764f3b29c69fda4cfc2466458343bc716c0b (patch) | |
| tree | 9dc5af2dfed4f6957e67b38fa7ed23e8dc13f7fb /capture_opts.c | |
| parent | f15bfdc22a48fa10509352f65840f84ff6cd61e7 (diff) | |
replace confusing #if checking for GlIB2.6.0 by #if GLIB_CHECK_VERSION(2,6,0)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24855 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'capture_opts.c')
| -rw-r--r-- | capture_opts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/capture_opts.c b/capture_opts.c index c958b59f1e..738acaeb98 100644 --- a/capture_opts.c +++ b/capture_opts.c @@ -532,7 +532,7 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg, case 'w': /* Write to capture file x */ capture_opts->saving_to_file = TRUE; g_free(capture_opts->save_file); -#if defined _WIN32 && (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 6)) +#if defined _WIN32 && GLIB_CHECK_VERSION(2,6,0) /* since GLib 2.6, we need to convert filenames to utf8 for Win32 */ capture_opts->save_file = g_locale_to_utf8(optarg, -1, NULL, NULL, NULL); #else |