diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-03 02:50:22 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-03 02:50:22 +0000 |
| commit | 894f6cd603cd7ca4ea53c89e0b0a227d44219e23 (patch) | |
| tree | 699d3bf11650af6cdd36559ed77fa3a051d79ce1 /capture_opts.c | |
| parent | 7cba4b49872457a22ed776e50a511316a36416e4 (diff) | |
| download | wireshark-894f6cd603cd7ca4ea53c89e0b0a227d44219e23.tar.gz | |
from Laurent Rabret:
I posted a patch about 1.5 years ago for the formerly Ethereal to successfully compiled with Visual > 6. I have always successfully used this patched Ethereal/Wireshark compiled with VS 2003 and have just checked when compiled with Visual C++ 2005 Express
svn path=/trunk/; revision=20282
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 37db6321df..22a912379f 100644 --- a/capture_opts.c +++ b/capture_opts.c @@ -363,7 +363,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_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 6)) && (!defined _MSC_VER || _MSC_VER < 1300) /* 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 |