summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2015-11-06 21:42:33 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2015-11-06 21:42:33 +0000
commita7c4a2aaa4138672571c46e1a7b658a857fc8ccf (patch)
tree97c50249acac29759621212c346a3880b9237ab8
parentc4ed5c36f0ed993598b33782128dec0e1a164f7b (diff)
Fix gcc version preprocessor checks to cope with gcc 5.x and beyond;
reported by Ruslan Babayev.
-rw-r--r--lib/libssl/src/crypto/bn/bn_lcl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/src/crypto/bn/bn_lcl.h b/lib/libssl/src/crypto/bn/bn_lcl.h
index a76ba4149f0..eb4af1b75b5 100644
--- a/lib/libssl/src/crypto/bn/bn_lcl.h
+++ b/lib/libssl/src/crypto/bn/bn_lcl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_lcl.h,v 1.21 2014/10/28 07:35:58 jsg Exp $ */
+/* $OpenBSD: bn_lcl.h,v 1.22 2015/11/06 21:42:32 miod Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -259,7 +259,7 @@ extern "C" {
# endif
# elif defined(__mips) && defined(_LP64)
# if defined(__GNUC__) && __GNUC__>=2
-# if __GNUC__>=4 && __GNUC_MINOR__>=4 /* "h" constraint is no more since 4.4 */
+# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) /* "h" constraint is no more since 4.4 */
# define BN_UMULT_HIGH(a,b) (((__uint128_t)(a)*(b))>>64)
# define BN_UMULT_LOHI(low,high,a,b) ({ \
__uint128_t ret=(__uint128_t)(a)*(b); \