From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 13 Mar 2002 13:59:38 +0000 (+0000)
Subject: Undo previous patch: avoid warnings by #undef'ing
X-Git-Tag: OpenSSL_0_9_6d~20^2~79
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=497810cae78a5beb8560a851f9a6800dfbbc0cbb;p=oweals%2Fopenssl.git

Undo previous patch: avoid warnings by #undef'ing
duplicate definitions.

Suggested by "Kenneth R. Robinette" <support@securenetterm.com>
---

diff --git a/ssl/kssl.c b/ssl/kssl.c
index a3a0596bfd..dc54035d2f 100644
--- a/ssl/kssl.c
+++ b/ssl/kssl.c
@@ -129,17 +129,20 @@
 #define krb5_timeofday           kssl_krb5_timeofday
 #define krb5_rc_default           kssl_krb5_rc_default
 
-#ifndef krb5_rc_initialize
-#define krb5_rc_initialize   kssl_krb5_rc_initialize
+#ifdef krb5_rc_initialize
+#undef krb5_rc_initialize
 #endif
+#define krb5_rc_initialize   kssl_krb5_rc_initialize
 
-#ifndef krb5_rc_get_lifespan
-#define krb5_rc_get_lifespan kssl_krb5_rc_get_lifespan
+#ifdef krb5_rc_get_lifespan
+#undef krb5_rc_get_lifespan
 #endif
+#define krb5_rc_get_lifespan kssl_krb5_rc_get_lifespan
 
-#ifndef krb5_rc_destroy
-#define krb5_rc_destroy      kssl_krb5_rc_destroy
+#ifdef krb5_rc_destroy
+#undef krb5_rc_destroy
 #endif
+#define krb5_rc_destroy      kssl_krb5_rc_destroy
 
 #define valid_cksumtype      kssl_valid_cksumtype
 #define krb5_checksum_size   kssl_krb5_checksum_size