diff --git a/crypto/bn/generic.c b/crypto/bn/generic.c
index 52aad8e..53b5ce1 100644
--- a/crypto/bn/generic.c
+++ b/crypto/bn/generic.c
@@ -822,9 +822,9 @@
 #endif /* !BN_LLONG */
 
 void bn_mul_comba8(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b) {
-#ifdef BN_LLONG
+#if defined(BN_LLONG)
   BN_ULLONG t;
-#else
+#elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
   BN_ULONG bl, bh;
 #endif
   BN_ULONG t1, t2;
@@ -930,9 +930,9 @@
 }
 
 void bn_mul_comba4(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b) {
-#ifdef BN_LLONG
+#if defined(BN_LLONG)
   BN_ULLONG t;
-#else
+#elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
   BN_ULONG bl, bh;
 #endif
   BN_ULONG t1, t2;
@@ -974,9 +974,9 @@
 }
 
 void bn_sqr_comba8(BN_ULONG *r, const BN_ULONG *a) {
-#ifdef BN_LLONG
+#if defined(BN_LLONG)
   BN_ULLONG t, tt;
-#else
+#elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
   BN_ULONG bl, bh;
 #endif
   BN_ULONG t1, t2;
@@ -1054,9 +1054,9 @@
 }
 
 void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a) {
-#ifdef BN_LLONG
+#if defined(BN_LLONG)
   BN_ULLONG t, tt;
-#else
+#elif !defined(BN_UMULT_LOHI) && !defined(BN_UMULT_HIGH)
   BN_ULONG bl, bh;
 #endif
   BN_ULONG t1, t2;