---------------------
PatchSet 7906 
Date: 2006/05/23 20:09:39
Author: serassio
Branch: nt
Tag: (none) 
Log:
Makefile.am files cleanup

Members: 
	lib/Makefile.am:1.7.8.2->1.7.8.3 
	lib/sspwin32.c:1.1.36.1->1.1.36.2 
	lib/win32lib.c:1.1.64.1->1.1.64.2 

Index: squid/lib/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/Makefile.am,v
retrieving revision 1.7.8.2
retrieving revision 1.7.8.3
diff -u -r1.7.8.2 -r1.7.8.3
--- squid/lib/Makefile.am	21 May 2006 12:23:54 -0000	1.7.8.2
+++ squid/lib/Makefile.am	23 May 2006 20:09:39 -0000	1.7.8.3
@@ -26,10 +26,8 @@
 
 if ENABLE_MINGW32SPECIFIC
 WIN32SRC = win32lib.c
-INCLUDES = -I$(top_srcdir)/port/win32/include -I$(top_srcdir)/include -I$(top_srcdir)/src
 else
 WIN32SRC=
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
 endif
 
 EXTRA_LIBRARIES = \
@@ -84,3 +82,4 @@
 libsspwin32_a_SOURCES = \
 	sspwin32.c
 
+INCLUDES	= -I$(top_builddir)/include -I$(top_srcdir)/include
Index: squid/lib/sspwin32.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/sspwin32.c,v
retrieving revision 1.1.36.1
retrieving revision 1.1.36.2
diff -u -r1.1.36.1 -r1.1.36.2
--- squid/lib/sspwin32.c	16 May 2006 21:05:58 -0000	1.1.36.1
+++ squid/lib/sspwin32.c	23 May 2006 20:09:39 -0000	1.1.36.2
@@ -15,7 +15,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  */
 
-#include "squid.h"
+#include "util.h"
+
 #include "ntlmauth.h"
 #include "sspwin32.h"
 
Index: squid/lib/win32lib.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/win32lib.c,v
retrieving revision 1.1.64.1
retrieving revision 1.1.64.2
diff -u -r1.1.64.1 -r1.1.64.2
--- squid/lib/win32lib.c	16 May 2006 21:05:58 -0000	1.1.64.1
+++ squid/lib/win32lib.c	23 May 2006 20:09:39 -0000	1.1.64.2
@@ -1,5 +1,5 @@
 /*
- * $Id: win32lib.c,v 1.1.64.1 2006/05/16 21:05:58 serassio Exp $
+ * $Id: win32lib.c,v 1.1.64.2 2006/05/23 20:09:39 serassio Exp $
  *
  * * * * * * * * Legal stuff * * * * * * *
  *
@@ -34,7 +34,7 @@
  *
  */
 
-#include "squid.h"
+#include "util.h"
 
 /* The following code section is part of an EXPERIMENTAL native */
 /* Windows NT/2000 Squid port - Compiles only on MS Visual C++  */
@@ -46,6 +46,7 @@
 #undef assert
 #include <assert.h>
 #include <stdio.h>
+#include <errno.h>
 #include <windows.h>
 #include <string.h>
 #include <sys/timeb.h>