---------------------
PatchSet 3867 
Date: 2006/10/22 12:17:08
Author: serassio
Branch: ipc
Tag: (none) 
Log:
Fix a merge inconsistency

Members: 
	src/ipc.h:1.1.32.1->1.1.32.2 

Index: squid3/src/ipc.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Attic/ipc.h,v
retrieving revision 1.1.32.1
retrieving revision 1.1.32.2
diff -u -r1.1.32.1 -r1.1.32.2
--- squid3/src/ipc.h	7 Nov 2005 21:21:09 -0000	1.1.32.1
+++ squid3/src/ipc.h	22 Oct 2006 12:17:08 -0000	1.1.32.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipc.h,v 1.1.32.1 2005/11/07 21:21:09 serassio Exp $
+ * $Id: ipc.h,v 1.1.32.2 2006/10/22 12:17:08 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -61,22 +61,13 @@
 
 struct IPCResult {
     IPCResult (int causelinkfailure);
-    IPCResult (bool aBool, pid_t aPid=-1, int _rfd=-1, int _wfd = -1
-#ifdef _SQUID_MSWIN_
-      ,HANDLE aHandle=NULL
-#endif
-      ) : success(aBool), pid (aPid), rfd (_rfd), wfd (_wfd)
-#ifdef _SQUID_MSWIN_
-      ,hIpc(aHandle)
-#endif
+    IPCResult (bool aBool, pid_t aPid=-1, int _rfd=-1, int _wfd = -1 ,void * aHandle=NULL) : success(aBool), pid (aPid), rfd (_rfd), wfd (_wfd), hIpc(aHandle)
 	{}
     bool success;
     pid_t pid;
     int rfd;
     int wfd;
-#ifdef _SQUID_MSWIN_
-    HANDLE hIpc;
-#endif
+    void * hIpc;
 };
 
 IPCResult ipcCreate(int type,