From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Thu, 20 Mar 2008 23:20:58 +0000 (+0100)
Subject: Merged from trunk
X-Git-Tag: BASIC_TPROXY4~15^2~5^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3f0834ce52283c21ea5e64343c80373a803eea4;p=thirdparty%2Fsquid.git

Merged from trunk
---

b3f0834ce52283c21ea5e64343c80373a803eea4
diff --cc src/AccessLogEntry.h
index b42b1ca0fc,8f5cdad685..574d684895
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@@ -116,8 -123,12 +116,10 @@@ public
  
          char *request;
          char *reply;
 -    }
 -
 -    headers;
 +    } headers;
  
+     // Why is this a sub-class and not a set of real "private:" fields?
+     // It looks like its duplicating HTTPRequestMethod anyway!
      class Private
      {
  
diff --cc src/PeerDigest.h
index 379d185f8b,6bb7650f6b..edc6d330e4
--- a/src/PeerDigest.h
+++ b/src/PeerDigest.h
@@@ -102,11 -102,11 +102,10 @@@ public
  
      struct
      {
- 
-         unsigned int needed:1;	/* there were requests for this digest */
-         unsigned int usable:1;	/* can be used for lookups */
-         unsigned int requested:1;	/* in process of receiving [fresh] digest */
+         unsigned int needed:1;          /**< there were requests for this digest */
+         unsigned int usable:1;          /**< can be used for lookups */
+         unsigned int requested:1;       /**< in process of receiving [fresh] digest */
 -    }
 -    flags;
 +    } flags;
  
      struct
      {
diff --cc src/typedefs.h
index 57b7161be3,79cdb1ff69..987208018a
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@@ -46,17 -46,14 +46,13 @@@ typedef struc
  {
      size_t bytes;
      size_t kb;
 -}
 -kb_t;
 +} kb_t;
  
- typedef struct _acl_time_data acl_time_data;
+ //UNUSED		typedef struct _acl_time_data acl_time_data;
+ //UNUSED		typedef struct _acl_name_list acl_name_list;
+ //UNUSED		typedef struct _acl_deny_info_list acl_deny_info_list;
+ //UNUSED		typedef class AuthUser auth_user_t;
  
- typedef struct _acl_name_list acl_name_list;
- 
- typedef struct _acl_deny_info_list acl_deny_info_list;
- 
- /// \ingroup AuthAPI
- /// \deprecated Use AuthUser instead.
- typedef class AuthUser auth_user_t;
  
  /// \ingroup AuthAPI
  /// \deprecated Use AuthUserHashPointer instead.