---------------------
PatchSet 4179 
Date: 2002/06/01 17:19:25
Author: serassio
Branch: coss
Tag: (none) 
Log:
Merged new COSS code from nt branch

Members: 
	src/structs.h:1.42.2.3->1.42.2.4 
	src/typedefs.h:1.23.12.3->1.23.12.4 

Index: squid/src/structs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/structs.h,v
retrieving revision 1.42.2.3
retrieving revision 1.42.2.4
diff -u -r1.42.2.3 -r1.42.2.4
--- squid/src/structs.h	21 May 2002 09:10:45 -0000	1.42.2.3
+++ squid/src/structs.h	1 Jun 2002 17:19:25 -0000	1.42.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.42.2.3 2002/05/21 09:10:45 serassio Exp $
+ * $Id: structs.h,v 1.42.2.4 2002/06/01 17:19:25 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1532,8 +1532,8 @@
     u_short refcount;
     u_short flags;
     /* END OF ON-DISK STORE_META_STD */
-    sfileno swap_filen;
-    sdirno swap_dirn;
+    sfileno swap_filen:25;
+    sdirno swap_dirn:7;
     u_short lock_count;		/* Assume < 65536! */
     mem_status_t mem_status:3;
     ping_status_t ping_status:3;
Index: squid/src/typedefs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/typedefs.h,v
retrieving revision 1.23.12.3
retrieving revision 1.23.12.4
diff -u -r1.23.12.3 -r1.23.12.4
--- squid/src/typedefs.h	21 May 2002 09:10:45 -0000	1.23.12.3
+++ squid/src/typedefs.h	1 Jun 2002 17:19:35 -0000	1.23.12.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.23.12.3 2002/05/21 09:10:45 serassio Exp $
+ * $Id: typedefs.h,v 1.23.12.4 2002/06/01 17:19:35 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -39,7 +39,7 @@
 typedef unsigned int ping_status_t;
 typedef unsigned int swap_status_t;
 typedef signed int sfileno;
-typedef signed char sdirno;
+typedef signed int sdirno;
 
 typedef struct {
     size_t bytes;