changed name of mpfr struct fields: _mp_d -> _mpfr_d

	(to detect conflicts with mpf)
fixed a few problems in non-STDC headers
moved definitions of mpfr-impl.h to mpfr-test.h and created a real mpfr-impl.h


git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/trunk@897 280ebfd0-de03-0410-8827-d642c229c3f4

1 files changed, 4 insertions, 10 deletions

diff --git a/ui_sub.c b/ui_sub.c
index c5da905c1..dc6d23029 100644
--- a/ui_sub.c
+++ b/ui_sub.c
@@ -21,12 +21,10 @@ MA 02111-1307, USA. */
 
 #include <stdio.h>
 #include "gmp.h"
-#include "mpfr.h"
 #include "gmp-impl.h"
 #include "longlong.h"
-
-#define MON_INIT(xp, x, p, s) xp = (mp_ptr) TMP_ALLOC(s*BYTES_PER_MP_LIMB); \
-   MPFR_PREC(x) = p; MPFR_MANT(x) = xp; x -> _mp_size = s;
+#include "mpfr.h"
+#include "mpfr-impl.h"
 
 void
 #if __STDC__
@@ -40,9 +38,8 @@ mpfr_ui_sub (y, u, x, rnd_mode)
 #endif
 {
   mpfr_t uu;
-  mp_limb_t *up;
+  mp_limb_t up[1];
   unsigned long cnt;
-  TMP_DECL(marker);
 
   if (MPFR_IS_NAN(x)) 
     {
@@ -58,15 +55,12 @@ mpfr_ui_sub (y, u, x, rnd_mode)
     }
 
   if (u) {
-    TMP_MARK(marker);
-    MON_INIT(up, uu, BITS_PER_MP_LIMB, 1);
+    MPFR_INIT1(up, uu, BITS_PER_MP_LIMB, 1);
     count_leading_zeros(cnt, (mp_limb_t) u);
     *up = (mp_limb_t) u << cnt;
     MPFR_EXP(uu) = BITS_PER_MP_LIMB-cnt;
   
     mpfr_sub (y, uu, x, rnd_mode);
-
-    TMP_FREE(marker);
   }
   else mpfr_neg (y, x, rnd_mode); /* if u=0, then set y to -x */
 }