From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sat, 22 Sep 2012 10:56:48 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_3_0_1~33^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16c1490555313516aa09b15c9f7b6f396feaba65;p=thirdparty%2Fsquid.git

Merged from trunk
---

16c1490555313516aa09b15c9f7b6f396feaba65
diff --cc src/SquidIpc.h
index 7abfeefe9e,30fcd344a0..61396d16e6
--- a/src/SquidIpc.h
+++ b/src/SquidIpc.h
@@@ -32,16 -32,17 +32,17 @@@
   *
   */
  
- namespace Ip {
-   class Address;
+ 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);
 +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);
++                const char *prog,
++                const char *const args[],
++                const char *name,
++                Ip::Address &local_addr,
++                int *rfd,
++                int *wfd,
++                void **hIpc);
  
  #endif /* SQUID_SQUIDIPC_H_ */