From: Richard Levitte <levitte@openssl.org>
Date: Wed, 11 Dec 2002 06:59:16 +0000 (+0000)
Subject: Since HEADER_DES_H has been the protector of des.h since libdes
X-Git-Tag: OpenSSL_0_9_7-beta6~18^2~15
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=005ef84c5d2995516955a816120e685469437087;hp=f92570f00a2db071dd5b99433fc2f3447ab85fd7

Since HEADER_DES_H has been the protector of des.h since libdes
(before SSLeay, maybe?), it's better to have that macro protect
the compatibility header des_old.h.  In the new des.h, let's use
a slightly different protecting macro.

The rationale is that there are application that might include (via
other header files, perhaps) both an old libdes des.h and OpenSSL's
des.h.  Whichever comes first would overshadow the other because of
the clash in protecting macro.  This fix solves that problem.
---

diff --git a/crypto/des/des.h b/crypto/des/des.h
index 4cb9d84fdf..daaf239dbe 100644
--- a/crypto/des/des.h
+++ b/crypto/des/des.h
@@ -56,8 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef HEADER_DES_H
-#define HEADER_DES_H
+#ifndef HEADER_NEW_DES_H
+#define HEADER_NEW_DES_H
 
 #ifdef OPENSSL_NO_DES
 #error DES is disabled.
diff --git a/crypto/des/des_old.h b/crypto/des/des_old.h
index 1d8bf65101..730bd6019c 100644
--- a/crypto/des/des_old.h
+++ b/crypto/des/des_old.h
@@ -88,8 +88,8 @@
  *
  */
 
-#ifndef HEADER_DES_OLD_H
-#define HEADER_DES_OLD_H
+#ifndef HEADER_DES_H
+#define HEADER_DES_H
 
 #ifdef OPENSSL_NO_DES
 #error DES is disabled.