aboutsummaryrefslogtreecommitdiffstats
path: root/tempfile.c
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2007-01-03 02:50:22 +0000
committerUlf Lamping <ulf.lamping@web.de>2007-01-03 02:50:22 +0000
commit894f6cd603cd7ca4ea53c89e0b0a227d44219e23 (patch)
tree699d3bf11650af6cdd36559ed77fa3a051d79ce1 /tempfile.c
parent7cba4b49872457a22ed776e50a511316a36416e4 (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 'tempfile.c')
-rw-r--r--tempfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tempfile.c b/tempfile.c
index b8711082b4..971f6d5b0e 100644
--- a/tempfile.c
+++ b/tempfile.c
@@ -39,7 +39,7 @@
#include "file_util.h"
-#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 */