From 2cfbb39fc4d8e21577ed58d79d6ffe8b65ff2588 Mon Sep 17 00:00:00 2001
From: hno <>
Date: Wed, 14 Nov 2001 02:25:08 +0000
Subject: [PATCH] Some minor cleanup of comments related to the OpenSSL MD5
 integration

---
 include/md5.h |  7 ++++++-
 src/squid.h   | 19 +------------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/include/md5.h b/include/md5.h
index b06a9faece..5c6080e479 100644
--- a/include/md5.h
+++ b/include/md5.h
@@ -1,5 +1,5 @@
 /*
- * $Id: md5.h,v 1.11 2001/10/17 13:30:49 hno Exp $
+ * $Id: md5.h,v 1.12 2001/11/13 19:25:08 hno Exp $
  */
 
 #ifndef SQUID_MD5_H
@@ -7,6 +7,11 @@
 
 #if USE_OPENSSL
 
+/*
+ * If Squid is compiled with OpenSSL then we use the MD5 routines
+ * from there via some wrapper macros, and the rest of this file is ignored..
+ */
+
 #if HAVE_OPENSSL_MD5_H
 #include <openssl/md5.h>
 #else
diff --git a/src/squid.h b/src/squid.h
index 12edf75517..4e7f84a3d9 100644
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.215 2001/04/14 00:03:23 hno Exp $
+ * $Id: squid.h,v 1.216 2001/11/13 19:25:08 hno Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -371,15 +371,6 @@ struct rusage {
 
 #if USE_SSL
 #include "ssl_support.h"
-/* This is an ugly hack, but necessary.
- *
- * Squid's md5 conflicts with OpenSSL's md5, but they're more or less
- * interchangable.
- * Free is defined in include/radix.h and also in OpenSSL, but we don't need
- * OpenSSL's, so it can be undef'd and then appear from radix.h later.
- * It's dangerous and ugly, but I can't see any other way to get around it.
- */
-#undef Free
 #endif
 
 #include "Stack.h"
@@ -410,14 +401,6 @@ struct rusage {
 
 #include "util.h"
 
-/*
- * Mac OS X Server already has radix.h as a standard header, so
- * this causes conflicts.
- */
-#ifndef _SQUID_APPLE_
-#include "radix.h"
-#endif
-
 #if !HAVE_TEMPNAM
 #include "tempnam.h"
 #endif
-- 
2.47.2