---------------------
PatchSet 7764 
Date: 2006/05/16 00:00:02
Author: hno
Branch: rproxy-2_5
Tag: Z-rproxy_merge_rproxy-2_5 
Log:
Resolve merge conflict with the 2GB patch (error maps)

Members: 
	src/errormap.c:1.1.52.1->1.1.52.2 
	src/typedefs.h:1.25.6.6.6.2->1.25.6.6.6.3 

Index: squid/src/errormap.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/errormap.c,v
retrieving revision 1.1.52.1
retrieving revision 1.1.52.2
diff -u -r1.1.52.1 -r1.1.52.2
--- squid/src/errormap.c	1 Feb 2005 13:18:44 -0000	1.1.52.1
+++ squid/src/errormap.c	16 May 2006 00:00:02 -0000	1.1.52.2
@@ -131,7 +131,7 @@
 	if (status != HTTP_OK)
 	    goto abort;
 	/* Send object to caller (cbdataValid verified above) */
-	state->callback(state->e, hdr_size, httpHeaderGetInt(&reply->header, HDR_CONTENT_LENGTH), state->callback_data);
+	state->callback(state->e, hdr_size, httpHeaderGetSize(&reply->header, HDR_CONTENT_LENGTH), state->callback_data);
 	errorMapFetchComplete(state);
 	goto done;
     }
Index: squid/src/typedefs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/typedefs.h,v
retrieving revision 1.25.6.6.6.2
retrieving revision 1.25.6.6.6.3
diff -u -r1.25.6.6.6.2 -r1.25.6.6.6.3
--- squid/src/typedefs.h	10 Jan 2006 21:34:27 -0000	1.25.6.6.6.2
+++ squid/src/typedefs.h	16 May 2006 00:00:03 -0000	1.25.6.6.6.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.25.6.6.6.2 2006/01/10 21:34:27 hno Exp $
+ * $Id: typedefs.h,v 1.25.6.6.6.3 2006/05/16 00:00:03 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -390,6 +390,6 @@
 typedef struct _external_acl external_acl;
 typedef struct _external_acl_entry external_acl_entry;
 
-typedef void ERRMAPCB(StoreEntry *, int body_offset, ssize_t content_length, void *data);
+typedef void ERRMAPCB(StoreEntry *, int body_offset, squid_off_t content_length, void *data);
 
 #endif /* SQUID_TYPEDEFS_H */