[Gmp-commit] /var/hg/gmp: 3 new changesets

[mercurial at gmplib.org]

details:   /var/hg/gmp/rev/d711dfe04ace
changeset: 14724:d711dfe04ace
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Sun Mar 04 08:33:33 2012 +0100
description:
gmp-h.in (__gmp_signed): Remove.

details:   /var/hg/gmp/rev/7a65639c46c3
changeset: 14725:7a65639c46c3
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Sun Mar 04 08:40:39 2012 +0100
description:
gmp-h.in (__GMP_HAVE_TOKEN_PASTE): Remove.

details:   /var/hg/gmp/rev/14737f2a2bdf
changeset: 14726:14737f2a2bdf
user:      Marco Bodrato <bodrato at mail.dm.unipi.it>
date:      Sun Mar 04 08:49:36 2012 +0100
description:
gmp-h.in (__GMP_HAVE_CONST): Remove.

diffstat:

 ChangeLog  |   4 ++++
 gmp-h.in   |  14 --------------
 gmp-impl.h |  15 ---------------
 3 files changed, 4 insertions(+), 29 deletions(-)

diffs (88 lines):

diff -r 7eb3497228ac -r 14737f2a2bdf ChangeLog
--- a/ChangeLog	Sun Mar 04 07:02:49 2012 +0100
+++ b/ChangeLog	Sun Mar 04 08:49:36 2012 +0100
@@ -3,6 +3,10 @@
 	* mpz/invert.c: Remove mod 0 branch.
 	* tests/mpz/t-invert.c: Avoid testing mod 0.
 
+	* gmp-h.in (__gmp_signed): Remove.
+	(__GMP_HAVE_TOKEN_PASTE, __GMP_HAVE_CONST): Remove.
+	* gmp-impl.h: Strip __GMP_HAVE_TOKEN_PASTE and __GMP_HAVE_CONST.
+
 2012-03-03  Torbjorn Granlund  <tege at gmplib.org>
 
 	* mpn/x86_64/k8/gmp-mparam.h: New file.
diff -r 7eb3497228ac -r 14737f2a2bdf gmp-h.in
--- a/gmp-h.in	Sun Mar 04 07:02:49 2012 +0100
+++ b/gmp-h.in	Sun Mar 04 08:49:36 2012 +0100
@@ -93,23 +93,13 @@
   || (defined (__mips) && defined (_SYSTYPE_SVR4))      \
   || defined (_MSC_VER)                                 \
   || 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
 
 
-#if __GMP_HAVE_CONST
 #define __gmp_const   const
-#define __gmp_signed  signed
-#else
-#define __gmp_const
-#define __gmp_signed
-#endif
 
 
 /* __GMP_DECLSPEC supports Windows DLL versions of libgmp, and is empty in
@@ -296,11 +286,7 @@
 
 
 #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 -r 7eb3497228ac -r 14737f2a2bdf gmp-impl.h
--- a/gmp-impl.h	Sun Mar 04 07:02:49 2012 +0100
+++ b/gmp-impl.h	Sun Mar 04 08:49:36 2012 +0100
@@ -231,13 +231,6 @@
 typedef struct {mp_limb_t inv21, inv32, inv53;} gmp_pi2_t;
 
 
-/* const and signed must match __gmp_const and __gmp_signed, so follow the
-   decision made for those in gmp.h.    */
-#if ! __GMP_HAVE_CONST
-#define const   /* empty */
-#define signed  /* empty */
-#endif
-
 /* "const" basically means a function does nothing but examine its arguments
    and give a return value, it doesn't read or write any memory (neither
    global nor pointed to by arguments), and has no other side-effects.  This
@@ -3731,17 +3724,9 @@
 #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 */