Portability: fix several class/struct type mismatches

Leftover problem from trunk r12339 changes.

Detected by clang on FreeBSD 9.

diff --git a/src/SquidConfig.cc b/src/SquidConfig.cc
index e1b951088602805f58899430b877dd0bb3d58dc6..78b171796bda9f6b04274a919bce51ecca22e6f0 100644 (file)
--- a/src/SquidConfig.cc
+++ b/src/SquidConfig.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "SquidConfig.h"
 
-struct SquidConfig Config;
+class SquidConfig Config;
 
-struct SquidConfig2 Config2;
+class SquidConfig2 Config2;
 

diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index 88af4bde47bce65898ff7ba3d924f640fdef814c..746f697bee7b3846ec1074b237ff93baa16f141f 100644 (file)
--- a/src/SquidConfig.h
+++ b/src/SquidConfig.h
@@ -548,7 +548,9 @@ public:
 
 extern SquidConfig Config;
 
-struct SquidConfig2 {
+class SquidConfig2
+{
+public:
     struct {
         int enable_purge;
         int mangle_request_headers;

diff --git a/src/anyp/PortCfg.h b/src/anyp/PortCfg.h
index f94a816e873c800beda99a13f16dbbbead8a6bd3..c8ae95cb2a1a6f8d6fd7b7cf902254b9d0c9ec98 100644 (file)
--- a/src/anyp/PortCfg.h
+++ b/src/anyp/PortCfg.h
@@ -11,7 +11,9 @@
 namespace AnyP
 {
 
-struct PortCfg {
+class PortCfg
+{
+public:
     PortCfg(const char *aProtocol);
     ~PortCfg();
     AnyP::PortCfg *clone() const;

diff --git a/src/disk.cc b/src/disk.cc
index 1e2595acc3217d2288ff6fc5a03534682822edb4..b14a538f11fd55b109a381dab816faadce8a08e1 100644 (file)
--- a/src/disk.cc
+++ b/src/disk.cc
@@ -167,7 +167,7 @@ file_close(int fd)
  * select() loop.       --SLF
  */
 static void
-diskCombineWrites(struct _fde_disk *fdd)
+diskCombineWrites(_fde_disk *fdd)
 {
     /*
      * We need to combine multiple write requests on an FD's write
@@ -220,7 +220,7 @@ diskHandleWrite(int fd, void *notused)
     int len = 0;
     fde *F = &fd_table[fd];
 
-    struct _fde_disk *fdd = &F->disk;
+    _fde_disk *fdd = &F->disk;
     dwrite_q *q = fdd->write_q;
     int status = DISK_OK;
     int do_close;