Moved IPC-related prototypes to newly-created SquidIpc.h

diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
index 3ee7d0744d8f6e795bb3a52a78e6e377eccebc38..ba4ce1bc5c8d41de43db3be93d6516dc2eb796cb 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
+++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
@@ -42,6 +42,7 @@
 #include "protos.h"
 #include "Store.h"
 #include "StatCounters.h"
+#include "SquidIpc.h"
 #include "SquidTime.h"
 #include "unlinkd.h"
 

diff --git a/src/Makefile.am b/src/Makefile.am
index c8ca66bbe31513fc634cb92f939015049e0ea25b..ee99ba0a3156ac1d7baf471e3c4aba23eaa8d882 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -156,9 +156,9 @@ WINSVC_SOURCE =
 endif
 
 if USE_IPC_WIN32
-IPC_SOURCE = ipc_win32.cc
+IPC_SOURCE = SquidIpc.h ipc_win32.cc
 else
-IPC_SOURCE = ipc.cc
+IPC_SOURCE = SquidIpc.h ipc.cc
 endif
 
 AIO_WIN32_ALL_SOURCES = \

diff --git a/src/SquidIpc.h b/src/SquidIpc.h
new file mode 100644 (file)
index 0000000..007e27b
--- /dev/null
+++ b/src/SquidIpc.h
@@ -0,0 +1,51 @@
+#ifndef SQUID_SQUIDIPC_H_
+#define SQUID_SQUIDIPC_H_
+/*
+ * DEBUG: section 54    Interprocess Communication
+ * AUTHOR: Duane Wessels
+ *
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+namespace Ip {
+  class Address;
+}
+extern pid_t ipcCreate(int type,
+                             const char *prog,
+                             const char *const args[],
+                             const char *name,
+                             Ip::Address &local_addr,
+                             int *rfd,
+                             int *wfd,
+                             void **hIpc);
+
+
+
+
+
+#endif /* SQUID_SQUIDIPC_H_ */

diff --git a/src/helper.cc b/src/helper.cc
index 5bf1ad27407b2bc17cef4d2548052e8e34bf6a59..252055b752e5c3a5dfe32cd53ec11ab9834e8d9e 100644 (file)
--- a/src/helper.cc
+++ b/src/helper.cc
@@ -43,6 +43,7 @@
 #include "Mem.h"
 #include "MemBuf.h"
 #include "protos.h"
+#include "SquidIpc.h"
 #include "SquidMath.h"
 #include "SquidTime.h"
 #include "Store.h"

diff --git a/src/icmp/IcmpSquid.cc b/src/icmp/IcmpSquid.cc
index 776683ff937d6181844d165c6e988b2c47323447..e819c4dbe8f0ba62b3bd9fdc54424d7f8a0030fd 100644 (file)
--- a/src/icmp/IcmpSquid.cc
+++ b/src/icmp/IcmpSquid.cc
@@ -40,6 +40,7 @@
 #include "icmp/net_db.h"
 #include "ip/tools.h"
 #include "protos.h"
+#include "SquidIpc.h"
 #include "SquidTime.h"
 
 #if HAVE_ERRNO_H

diff --git a/src/ipc.cc b/src/ipc.cc
index f2696a499de22b1d762e087a26e248eff47fe5d5..373e5f4252ab2d85b4e0eb50fbb5d0ec9ccf3fae 100644 (file)
--- a/src/ipc.cc
+++ b/src/ipc.cc
@@ -37,6 +37,7 @@
 #include "globals.h"
 #include "ip/Address.h"
 #include "protos.h"
+#include "SquidIpc.h"
 #include "tools.h"
 #include "rfc1738.h"
 

diff --git a/src/ipc_win32.cc b/src/ipc_win32.cc
index b10d59b98065fc26b5ccd0c3e6359bc1aec7dc82..12c6d480324a74a71b94896e32a70d12c0e1e19c 100644 (file)
--- a/src/ipc_win32.cc
+++ b/src/ipc_win32.cc
@@ -40,6 +40,7 @@
 #include "fde.h"
 #include "ip/Address.h"
 #include "rfc1738.h"
+#include "SquidIpc.h"
 #include "SquidTime.h"
 #include "tools.h"
 

diff --git a/src/log/ModDaemon.cc b/src/log/ModDaemon.cc
index f603a9559e38cb18bedb29b7f5f7b7e1b4e17399..0eb8dc89d72f04afd012ede3de1e3c68d924e099 100644 (file)
--- a/src/log/ModDaemon.cc
+++ b/src/log/ModDaemon.cc
@@ -39,6 +39,7 @@
 #include "log/File.h"
 #include "log/ModDaemon.h"
 #include "protos.h"
+#include "SquidIpc.h"
 #include "SquidTime.h"
 
 #if HAVE_ERRNO_H

diff --git a/src/protos.h b/src/protos.h
index 2b1f22d921299c2900e3b1fb2e7be5208d017d80..f3fd67d5a247ada8eb9a2b30efa72902ed5b7525 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -81,18 +81,6 @@ extern void reconfigure(int);
 #include "fatal.h"
 
 
-/*
- * ipc.c
- */
-SQUIDCEXTERN pid_t ipcCreate(int type,
-                             const char *prog,
-                             const char *const args[],
-                             const char *name,
-                             Ip::Address &local_addr,
-                             int *rfd,
-                             int *wfd,
-                             void **hIpc);
-
 /*
  * prototypes for system functions missing from system includes
  */

diff --git a/src/unlinkd.cc b/src/unlinkd.cc
index b2e687a17d09de1071dba7609be84b5bfdeb5f27..ab1bafd03521fd79fd0b826dc9af540982f429d2 100644 (file)
--- a/src/unlinkd.cc
+++ b/src/unlinkd.cc
@@ -39,6 +39,7 @@
 #include "globals.h"
 #include "xusleep.h"
 #include "protos.h"
+#include "SquidIpc.h"
 #include "SquidTime.h"
 #include "StatCounters.h"
 #include "SwapDir.h"