diff options
| author | Marco Bodrato <bodrato@mail.dm.unipi.it> | 2012-03-04 08:40:39 +0100 |
|---|---|---|
| committer | Marco Bodrato <bodrato@mail.dm.unipi.it> | 2012-03-04 08:40:39 +0100 |
| commit | 2e2b61af82ee36ce37fdcf635aa3f67af3542cbf (patch) | |
| tree | c123fcecad331119f3e6f1b7d1cb2434a4b9c12c | |
| parent | f16cd26af739ac19b270b118b1d2e7c9bc786678 (diff) | |
| download | gmp-2e2b61af82ee36ce37fdcf635aa3f67af3542cbf.tar.gz | |
gmp-h.in (__GMP_HAVE_TOKEN_PASTE): Remove.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | gmp-h.in | 6 | ||||
| -rw-r--r-- | gmp-impl.h | 8 |
3 files changed, 2 insertions, 15 deletions
@@ -3,7 +3,8 @@ * mpz/invert.c: Remove mod 0 branch. * tests/mpz/t-invert.c: Avoid testing mod 0. - * gmp-h.in (__gmp_signed): Remove. + * gmp-h.in (__gmp_signed, __GMP_HAVE_TOKEN_PASTE): Remove. + * gmp-impl.h: Strip __GMP_HAVE_TOKEN_PASTE usage. 2012-03-03 Torbjorn Granlund <tege@gmplib.org> @@ -95,11 +95,9 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ || defined (_WIN32) #define __GMP_HAVE_CONST 1 #define __GMP_HAVE_PROTOTYPES 1 -#define __GMP_HAVE_TOKEN_PASTE 1 #else #define __GMP_HAVE_CONST 0 #define __GMP_HAVE_PROTOTYPES 0 -#define __GMP_HAVE_TOKEN_PASTE 0 #endif @@ -294,11 +292,7 @@ typedef __mpq_struct *mpq_ptr; #ifndef __MPN -#if __GMP_HAVE_TOKEN_PASTE #define __MPN(x) __gmpn_##x -#else -#define __MPN(x) __gmpn_/**/x -#endif #endif /* For reference, "defined(EOF)" cannot be used here. In g++ 2.95.4, diff --git a/gmp-impl.h b/gmp-impl.h index 036c9f62f..ce6df4ce4 100644 --- a/gmp-impl.h +++ b/gmp-impl.h @@ -3731,17 +3731,9 @@ __GMP_DECLSPEC void __gmp_invalid_operation (void) ATTRIBUTE_NORETURN; #define SQRT_OF_NEGATIVE __gmp_sqrt_of_negative () #if defined _LONG_LONG_LIMB -#if __GMP_HAVE_TOKEN_PASTE #define CNST_LIMB(C) ((mp_limb_t) C##LL) -#else -#define CNST_LIMB(C) ((mp_limb_t) C/**/LL) -#endif #else /* not _LONG_LONG_LIMB */ -#if __GMP_HAVE_TOKEN_PASTE #define CNST_LIMB(C) ((mp_limb_t) C##L) -#else -#define CNST_LIMB(C) ((mp_limb_t) C/**/L) -#endif #endif /* _LONG_LONG_LIMB */ /* Stuff used by mpn/generic/perfsqr.c and mpz/prime_p.c */ |