[or-cvs] Patch based on post by Mike C to or-dev; special-case based...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/tor/src/common
In directory moria:/tmp/cvs-serv13421/src/common

Modified Files:
	compat.h torgzip.c 
Log Message:
Patch based on post by Mike C to or-dev; special-case based on use of MSVC, rather than on MS_WINDOWS, so that mingw builds.

Index: compat.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/common/compat.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -d -r1.46 -r1.47
--- compat.h	28 May 2006 16:54:39 -0000	1.46
+++ compat.h	3 Jun 2006 18:52:31 -0000	1.47
@@ -89,7 +89,7 @@ size_t strlcat(char *dst, const char *sr
 size_t strlcpy(char *dst, const char *src, size_t siz);
 #endif
 
-#ifdef MS_WINDOWS
+#ifdef _MSC_VER
 #define U64_PRINTF_ARG(a) (a)
 #define U64_SCANF_ARG(a) (a)
 #define U64_FORMAT "%I64u"

Index: torgzip.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/common/torgzip.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -d -r1.32 -r1.33
--- torgzip.c	21 Mar 2006 20:31:27 -0000	1.32
+++ torgzip.c	3 Jun 2006 18:52:31 -0000	1.33
@@ -15,7 +15,7 @@ const char torgzip_c_id[] =
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
-#ifdef MS_WINDOWS
+#ifdef _MSC_VER
 #include "..\..\contrib\zlib\zlib.h"
 #else
 #include <zlib.h>