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 /wiretap | |
| parent | 7cba4b49872457a22ed776e50a511316a36416e4 (diff) | |
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 'wiretap')
| -rw-r--r-- | wiretap/file_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/file_util.h b/wiretap/file_util.h index 513fa13fe2..2978fc72d6 100644 --- a/wiretap/file_util.h +++ b/wiretap/file_util.h @@ -42,7 +42,7 @@ extern "C" { /* Since GLib2.6, wrappers were added around functions which provides filenames to library functions, like open() does. */ -#if GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 6) +#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 6)) && (!defined _MSC_VER || _MSC_VER < 1300) #include <glib/gstdio.h> /* available since GLib 2.6 only! */ /* GLib2.6 or above, using new wrapper functions */ |