------------------------------------------------------------
revno: 12356
revision-id: squid3@treenet.co.nz-20121010015203-712d1knoxxozsv7r
parent: squid3@treenet.co.nz-20121010015109-fgkkp6rcw7ivlhi5
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Tue 2012-10-09 19:52:03 -0600
message:
  Portability: fix several class/struct type mismatches
  
  Leftover problem from trunk r12339 changes.
  
  Detected by clang on FreeBSD 9.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20121010015203-712d1knoxxozsv7r
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: fcd1a668bdeff27b5173a33adbd41723aa7e053c
# timestamp: 2012-10-10 01:52:46 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20121010015109-\
#   fgkkp6rcw7ivlhi5
# 
# Begin patch
=== modified file 'src/SquidConfig.cc'
--- src/SquidConfig.cc	2012-09-04 09:10:20 +0000
+++ src/SquidConfig.cc	2012-10-10 01:52:03 +0000
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "SquidConfig.h"
 
-struct SquidConfig Config;
+class SquidConfig Config;
 
-struct SquidConfig2 Config2;
+class SquidConfig2 Config2;
 

=== modified file 'src/SquidConfig.h'
--- src/SquidConfig.h	2012-10-04 00:23:44 +0000
+++ src/SquidConfig.h	2012-10-10 01:52:03 +0000
@@ -548,7 +548,9 @@
 
 extern SquidConfig Config;
 
-struct SquidConfig2 {
+class SquidConfig2
+{
+public:
     struct {
         int enable_purge;
         int mangle_request_headers;

=== modified file 'src/anyp/PortCfg.h'
--- src/anyp/PortCfg.h	2012-09-06 13:12:26 +0000
+++ src/anyp/PortCfg.h	2012-10-10 01:52:03 +0000
@@ -11,7 +11,9 @@
 namespace AnyP
 {
 
-struct PortCfg {
+class PortCfg
+{
+public:
     PortCfg(const char *aProtocol);
     ~PortCfg();
     AnyP::PortCfg *clone() const;

=== modified file 'src/disk.cc'
--- src/disk.cc	2012-09-24 19:27:10 +0000
+++ src/disk.cc	2012-10-10 01:52:03 +0000
@@ -167,7 +167,7 @@
  * 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 @@
     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;