From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 1 Apr 2010 07:39:04 +0000 (+0200)
Subject: Fixed merge error.
X-Git-Tag: SQUID_3_2_0_1~310^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=def88adc8edfd00c62a9a7a606e260fba3be8c22;p=thirdparty%2Fsquid.git

Fixed merge error.
---

diff --git a/include/config.h b/include/config.h
index b98992380e..7bc6bc2a6e 100644
--- a/include/config.h
+++ b/include/config.h
@@ -174,10 +174,6 @@ typedef unsigned long fd_mask;
 typedef int socklen_t;
 #endif
 
-#if !HAVE_MTYP_T
-typedef long mtyp_t;
-#endif
-
 #if !defined(CACHEMGR_HOSTNAME)
 #define CACHEMGR_HOSTNAME ""
 #else