---------------------
PatchSet 6620 
Date: 2005/04/25 14:49:25
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
MinGW fixes

Members: 
	port/win32/include/squid-mswin.h:1.1.2.28->1.1.2.29 
	src/squid.h:1.13.6.2.4.11->1.13.6.2.4.12 

Index: squid/port/win32/include/squid-mswin.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/squid-mswin.h,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -u -r1.1.2.28 -r1.1.2.29
--- squid/port/win32/include/squid-mswin.h	22 Apr 2005 19:07:42 -0000	1.1.2.28
+++ squid/port/win32/include/squid-mswin.h	25 Apr 2005 14:49:25 -0000	1.1.2.29
@@ -1,5 +1,5 @@
 /*
- * $Id: squid-mswin.h,v 1.1.2.28 2005/04/22 19:07:42 serassio Exp $
+ * $Id: squid-mswin.h,v 1.1.2.29 2005/04/25 14:49:25 serassio Exp $
  *
  * AUTHOR: Guido Serassio & Andrey Shorin
  *
@@ -168,12 +168,12 @@
 #define tell _telli64
 
 #else
-#define stat _stat
 #if defined(_MSC_VER) /* Microsoft C Compiler ONLY */
+#define stat _stat
 #define lseek _lseek
-#endif
 #define fstat _fstat
 #define tell _tell
+#endif
 
 #endif
 
Index: squid/src/squid.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/squid.h,v
retrieving revision 1.13.6.2.4.11
retrieving revision 1.13.6.2.4.12
diff -u -r1.13.6.2.4.11 -r1.13.6.2.4.12
--- squid/src/squid.h	28 Mar 2005 09:34:20 -0000	1.13.6.2.4.11
+++ squid/src/squid.h	25 Apr 2005 14:49:25 -0000	1.13.6.2.4.12
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.13.6.2.4.11 2005/03/28 09:34:20 serassio Exp $
+ * $Id: squid.h,v 1.13.6.2.4.12 2005/04/25 14:49:25 serassio Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -494,7 +494,7 @@
 #ifndef getpagesize
 extern size_t getpagesize(void);
 #endif
-#ifndef strtoll
+#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */
 #define strtoll WIN32_strtoll
 #endif
 #endif /* _SQUID_MSWIN_ */