From cf1b7d96647d55e533f779e476e3d4371f40445a Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Mon, 19 Feb 2001 16:06:34 +0000
Subject: Make all configuration macros available for application by making
 sure they are available in opensslconf.h, by giving them names starting with
 "OPENSSL_" to avoid conflicts with other packages and by making sure e_os2.h
 will cover all platform-specific cases together with opensslconf.h.

I've checked fairly well that nothing breaks with this (apart from
external software that will adapt if they have used something like
NO_KRB5), but I can't guarantee it completely, so a review of this
change would be a good thing.
---
 crypto/lhash/Makefile.ssl | 10 ++++++----
 crypto/lhash/lh_stats.c   |  6 +++---
 crypto/lhash/lhash.c      |  6 +++---
 crypto/lhash/lhash.h      | 10 +++++-----
 4 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'crypto/lhash')

diff --git a/crypto/lhash/Makefile.ssl b/crypto/lhash/Makefile.ssl
index 60bb6b12e4..ce27652abd 100644
--- a/crypto/lhash/Makefile.ssl
+++ b/crypto/lhash/Makefile.ssl
@@ -11,7 +11,8 @@ INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=/usr/local/ssl
 MAKE=		make -f Makefile.ssl
-MAKEDEPEND=	$(TOP)/util/domd $(TOP)
+MAKEDEPPROG=	makedepend
+MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
 MAKEFILE=	Makefile.ssl
 AR=		ar r
 
@@ -85,8 +86,9 @@ lh_stats.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 lh_stats.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 lh_stats.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
 lh_stats.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-lh_stats.o: ../cryptlib.h
+lh_stats.o: ../cryptlib.h lh_stats.c
 lhash.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-lhash.o: ../../include/openssl/lhash.h ../../include/openssl/opensslv.h
+lhash.o: ../../include/openssl/e_os2.h ../../include/openssl/lhash.h
+lhash.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 lhash.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-lhash.o: ../../include/openssl/symhacks.h
+lhash.o: ../../include/openssl/symhacks.h lhash.c
diff --git a/crypto/lhash/lh_stats.c b/crypto/lhash/lh_stats.c
index 62dab3acc9..bdfbc8eaea 100644
--- a/crypto/lhash/lh_stats.c
+++ b/crypto/lhash/lh_stats.c
@@ -63,12 +63,12 @@
  * and things should work as expected */
 #include "cryptlib.h"
 
-#ifndef NO_BIO
+#ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
 #include <openssl/lhash.h>
 
-#ifdef NO_BIO
+#ifdef OPENSSL_NO_BIO
 
 void lh_stats(LHASH *lh, FILE *out)
 	{
@@ -138,7 +138,7 @@ void lh_node_usage_stats(LHASH *lh, FILE *out)
 
 #else
 
-#ifndef NO_FP_API
+#ifndef OPENSSL_NO_FP_API
 void lh_stats(const LHASH *lh, FILE *fp)
 	{
 	BIO *bp;
diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c
index 9d815f0ca0..a07c26c578 100644
--- a/crypto/lhash/lhash.c
+++ b/crypto/lhash/lhash.c
@@ -197,7 +197,7 @@ void *lh_insert(LHASH *lh, const void *data)
 			}
 		nn->data=data;
 		nn->next=NULL;
-#ifndef NO_HASH_COMP
+#ifndef OPENSSL_NO_HASH_COMP
 		nn->hash=hash;
 #endif
 		*rn=nn;
@@ -318,7 +318,7 @@ static void expand(LHASH *lh)
 	
 	for (np= *n1; np != NULL; )
 		{
-#ifndef NO_HASH_COMP
+#ifndef OPENSSL_NO_HASH_COMP
 		hash=np->hash;
 #else
 		hash=lh->hash(np->data);
@@ -415,7 +415,7 @@ static LHASH_NODE **getrn(LHASH *lh, const void *data, unsigned long *rhash)
 	ret= &(lh->b[(int)nn]);
 	for (n1= *ret; n1 != NULL; n1=n1->next)
 		{
-#ifndef NO_HASH_COMP
+#ifndef OPENSSL_NO_HASH_COMP
 		lh->num_hash_comps++;
 		if (n1->hash != hash)
 			{
diff --git a/crypto/lhash/lhash.h b/crypto/lhash/lhash.h
index ddd8e12d05..2dab2317d7 100644
--- a/crypto/lhash/lhash.h
+++ b/crypto/lhash/lhash.h
@@ -63,11 +63,11 @@
 #ifndef HEADER_LHASH_H
 #define HEADER_LHASH_H
 
-#ifndef NO_FP_API
+#ifndef OPENSSL_NO_FP_API
 #include <stdio.h>
 #endif
 
-#ifndef NO_BIO
+#ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
 
@@ -79,7 +79,7 @@ typedef struct lhash_node_st
 	{
 	const void *data;
 	struct lhash_node_st *next;
-#ifndef NO_HASH_COMP
+#ifndef OPENSSL_NO_HASH_COMP
 	unsigned long hash;
 #endif
 	} LHASH_NODE;
@@ -180,13 +180,13 @@ void lh_doall_arg(LHASH *lh, LHASH_DOALL_ARG_FN_TYPE func, const void *arg);
 unsigned long lh_strhash(const char *c);
 unsigned long lh_num_items(const LHASH *lh);
 
-#ifndef NO_FP_API
+#ifndef OPENSSL_NO_FP_API
 void lh_stats(const LHASH *lh, FILE *out);
 void lh_node_stats(const LHASH *lh, FILE *out);
 void lh_node_usage_stats(const LHASH *lh, FILE *out);
 #endif
 
-#ifndef NO_BIO
+#ifndef OPENSSL_NO_BIO
 void lh_stats_bio(const LHASH *lh, BIO *out);
 void lh_node_stats_bio(const LHASH *lh, BIO *out);
 void lh_node_usage_stats_bio(const LHASH *lh, BIO *out);
-- 
cgit v1.2.3