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 c81910851a34716fa2fbb195b8d79d1131dbc1a4..bbbc1cb91a298f48e25f6f1c36248407ddbc0b74 100644 (file)
--- 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