From: Bodo Möller <bodo@openssl.org>
Date: Tue, 6 Jul 1999 17:28:29 +0000 (+0000)
Subject: improve readability of #if conditions (ELF, if defined, supersedes BSDI
X-Git-Tag: OpenSSL_0_9_4~126
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5685dcd445558155977451754953a24f9fbf222e;p=oweals%2Fopenssl.git

improve readability of #if conditions (ELF, if defined, supersedes BSDI
[which we don't really define if ELF is defined, but who knows])
---

diff --git a/crypto/perlasm/x86asm.pl b/crypto/perlasm/x86asm.pl
index c81910851a..bbbc1cb91a 100644
--- a/crypto/perlasm/x86asm.pl
+++ b/crypto/perlasm/x86asm.pl
@@ -75,7 +75,7 @@ sub asm_finish_cpp
 #define TYPE(a,b)       .type   a,b
 #define SIZE(a,b)       .size   a,b
 
-#if defined(OUT) || defined(BSDI)
+#if defined(OUT) || (defined(BSDI) && !defined(ELF))
 $tmp
 #endif
 
@@ -84,7 +84,7 @@ $tmp
 #define ALIGN	4
 #endif
 
-#ifdef BSDI
+#if defined(BSDI) && !defined(ELF)
 #define OK              1
 #define ALIGN           4
 #undef SIZE