From 882b1bc1c4fc5a69489be06de772887e9fbb79c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Mon, 30 Mar 2015 21:19:18 +0200
Subject: [PATCH] Moved definition of GMP_NUMB_BITS (for mini-gmp) from
bignum.h to version.h.in.
---
ChangeLog | 4 ++++
bignum.h | 3 ---
version.h.in | 6 ++++++
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 35fbefc7..9a4d62f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-03-30 Niels Möller <nisse@diamant.hack.org>
+ * version.h.in (GMP_NUMB_BITS) [NETTLE_USE_MINI_GMP]: Move
+ definition here (uses configure substitution).
+ * bignum.h (GMP_NUMB_BITS): ...old location.
+
* nettle.texinfo: Updated version number.
(Installation): Document some more configure options.
diff --git a/bignum.h b/bignum.h
index 84530d38..24158e06 100644
--- a/bignum.h
+++ b/bignum.h
@@ -44,9 +44,6 @@
#if NETTLE_USE_MINI_GMP
# include "mini-gmp.h"
-/* We need a preprocessor constant for GMP_NUMB_BITS, simply using
- sizeof(mp_limb_t) * CHAR_BIT is not good enough. */
-# define GMP_NUMB_BITS @GMP_NUMB_BITS@
# define GMP_NUMB_MASK (~(mp_limb_t) 0)
/* Functions missing in older gmp versions, and checked for with ifdef */
diff --git a/version.h.in b/version.h.in
index e3c01dba..447e933e 100644
--- a/version.h.in
+++ b/version.h.in
@@ -44,6 +44,12 @@ extern "C" {
#define NETTLE_USE_MINI_GMP @NETTLE_USE_MINI_GMP@
+/* We need a preprocessor constant for GMP_NUMB_BITS, simply using
+ sizeof(mp_limb_t) * CHAR_BIT is not good enough. */
+#if NETTLE_USE_MINI_GMP
+# define GMP_NUMB_BITS @GMP_NUMB_BITS@
+#endif
+
#ifdef __cplusplus
}
#endif
--
GitLab