From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sun, 30 Aug 2015 02:07:21 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: SQUID_4_0_1~81^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc5c63884aa657defa081e2017cc824dd31a1c18;p=thirdparty%2Fsquid.git

Merged from trunk
---

fc5c63884aa657defa081e2017cc824dd31a1c18
diff --cc src/ClientInfo.h
index 4bd5962a99,c84f7d3f78..07f4195fb3
--- a/src/ClientInfo.h
+++ b/src/ClientInfo.h
@@@ -14,7 -15,8 +15,8 @@@
  #include "hash.h"
  #include "ip/Address.h"
  #include "LogTags.h"
 -#include "typedefs.h"
 +#include "typedefs.h" //for kb_t
+ 
  #include <deque>
  
  #if USE_DELAY_POOLS
diff --cc src/typedefs.h
index da6604410b,0022fbe06d..7c0a193c98
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@@ -6,15 -6,27 +6,10 @@@
   * Please see the COPYING and CONTRIBUTORS files for details.
   */
  
--#include "enums.h"
--
  #ifndef SQUID_TYPEDEFS_H
  #define SQUID_TYPEDEFS_H
  
- typedef struct {
-     size_t bytes;
-     size_t kb;
- } kb_t;
 -typedef int32_t sfileno;
 -typedef signed int sdirno;
 -
 -typedef uint32_t nfmark_t;
 -typedef unsigned char tos_t;
 -
 -typedef struct _CommWriteStateData CommWriteStateData;
 -
 -#if SQUID_SNMP
 -#include "cache_snmp.h"
 -typedef variable_list *(oid_ParseFn) (variable_list *, snint *);
 -#endif
 -
 -typedef void FREE(void *);
 -typedef void FOCB(void *, int fd, int errcode);
 -typedef void PF(int, void *);
++#include "enums.h"
  
  /* disk.c / diskd.c callback typedefs */
  typedef void DRCB(int, const char *buf, int size, int errflag, void *data);