---------------------
PatchSet 3675 
Date: 2006/09/03 16:23:50
Author: serassio
Branch: ipc
Tag: (none) 
Log:
Imported latest IPC (refactored) changes from nt branch

Members: 
	src/defines.h:1.12.4.2->1.12.4.3 
	src/protos.h:1.60.2.10->1.60.2.11 

Index: squid3/src/defines.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/defines.h,v
retrieving revision 1.12.4.2
retrieving revision 1.12.4.3
diff -u -r1.12.4.2 -r1.12.4.3
--- squid3/src/defines.h	30 Aug 2006 08:15:40 -0000	1.12.4.2
+++ squid3/src/defines.h	3 Sep 2006 16:23:50 -0000	1.12.4.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: defines.h,v 1.12.4.2 2006/08/30 08:15:40 serassio Exp $
+ * $Id: defines.h,v 1.12.4.3 2006/09/03 16:23:50 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -180,21 +180,6 @@
 #define STORE_META_DIRTY  0x04
 #define STORE_META_BAD    0x05
 
-#define IPC_NONE 0
-#define IPC_TCP_SOCKET 1
-#define IPC_UDP_SOCKET 2
-#define IPC_FIFO 3
-#define IPC_UNIX_STREAM 4
-#define IPC_UNIX_DGRAM 5
-
-#if HAVE_SOCKETPAIR && defined (AF_UNIX)
-#define IPC_STREAM IPC_UNIX_STREAM
-#define IPC_DGRAM IPC_UNIX_DGRAM
-#else
-#define IPC_STREAM IPC_TCP_SOCKET
-#define IPC_DGRAM IPC_UDP_SOCKET
-#endif
-
 #define STORE_META_KEY STORE_META_KEY_MD5
 
 #define STORE_META_TLD_START sizeof(int)+sizeof(char)
Index: squid3/src/protos.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/protos.h,v
retrieving revision 1.60.2.10
retrieving revision 1.60.2.11
diff -u -r1.60.2.10 -r1.60.2.11
--- squid3/src/protos.h	30 Aug 2006 08:15:41 -0000	1.60.2.10
+++ squid3/src/protos.h	3 Sep 2006 16:23:50 -0000	1.60.2.11
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.60.2.10 2006/08/30 08:15:41 serassio Exp $
+ * $Id: protos.h,v 1.60.2.11 2006/09/03 16:23:50 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -676,17 +676,6 @@
 SQUIDCEXTERN void strwordquote(MemBuf * mb, const char *str);
 
 
-
-/*
- * ipc.c
- */
-SQUIDCEXTERN int ipcCreate(int type,
-                           const char *prog,
-                           const char *const args[],
-                           const char *name,
-                           int *rfd,
-                           int *wfd);
-
 /* CacheDigest */
 SQUIDCEXTERN CacheDigest *cacheDigestCreate(int capacity, int bpe);
 SQUIDCEXTERN void cacheDigestDestroy(CacheDigest * cd);