---------------------
PatchSet 8045 
Date: 2006/05/27 13:56:13
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed inline problem

Members: 
	port/win32/include/autoconf.h:1.1.38.3->1.1.38.4 
	port/win32/squid/squid.dsp:1.1.38.3->1.1.38.4 
	src/client_side.c:1.89.2.10->1.89.2.11 

Index: squid/port/win32/include/autoconf.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/autoconf.h,v
retrieving revision 1.1.38.3
retrieving revision 1.1.38.4
diff -u -r1.1.38.3 -r1.1.38.4
--- squid/port/win32/include/autoconf.h	27 May 2006 13:18:03 -0000	1.1.38.3
+++ squid/port/win32/include/autoconf.h	27 May 2006 13:56:13 -0000	1.1.38.4
@@ -831,6 +831,12 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #define fd_mask int
 
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#define inline __inline
+#endif
+
 /* Have int datatype */
 #define int16_t short
 
Index: squid/port/win32/squid/squid.dsp
===================================================================
RCS file: /cvsroot/squid-sf//squid/port/win32/squid/Attic/squid.dsp,v
retrieving revision 1.1.38.3
retrieving revision 1.1.38.4
diff -u -r1.1.38.3 -r1.1.38.4
--- squid/port/win32/squid/squid.dsp	27 May 2006 13:18:04 -0000	1.1.38.3
+++ squid/port/win32/squid/squid.dsp	27 May 2006 13:56:14 -0000	1.1.38.4
@@ -42,7 +42,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /GX /I "../../" /I "../include" /I "../../../include" /I "../../../src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /D _FILE_OFFSET_BITS=64 /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GX /Ob1 /I "../../" /I "../include" /I "../../../include" /I "../../../src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /D _FILE_OFFSET_BITS=64 /YX /FD /c
 # ADD BASE RSC /l 0x410 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.89.2.10
retrieving revision 1.89.2.11
diff -u -r1.89.2.10 -r1.89.2.11
--- squid/src/client_side.c	27 May 2006 08:01:21 -0000	1.89.2.10
+++ squid/src/client_side.c	27 May 2006 13:59:21 -0000	1.89.2.11
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.89.2.10 2006/05/27 08:01:21 serassio Exp $
+ * $Id: client_side.c,v 1.89.2.11 2006/05/27 13:59:21 serassio Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -4249,7 +4249,7 @@
     }
 }
 #else
-static int
+static int inline
 clientNatLookup(ConnStateData * conn)
 {
     static time_t last_reported = 0;