From 4627e23038986fcc9076f15650bf8311accc6fb8 Mon Sep 17 00:00:00 2001 From: ulfl Date: Wed, 3 Jan 2007 02:50:22 +0000 Subject: 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 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20282 f5534014-38df-0310-8fa8-9805f1628bb7 --- tempfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tempfile.c') 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 /* available since GLib 2.6 only! */ /* GLib2.6 or above, using new wrapper functions */ -- cgit v1.2.3