From bbdf9ff47089abdbfeb73c0446e2f5777294e60f Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 9 Oct 2012 19:52:03 -0600
Subject: [PATCH] Portability: fix several class/struct type mismatches

Leftover problem from trunk r12339 changes.

Detected by clang on FreeBSD 9.
---
 src/SquidConfig.cc | 4 ++--
 src/SquidConfig.h  | 4 +++-
 src/anyp/PortCfg.h | 4 +++-
 src/disk.cc        | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/SquidConfig.cc b/src/SquidConfig.cc
index e1b9510886..78b171796b 100644
--- 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 88af4bde47..746f697bee 100644
--- 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 f94a816e87..c8ae95cb2a 100644
--- 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 1e2595acc3..b14a538f11 100644
--- 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;
-- 
2.47.2