Remove TMP_XXXX marker arguments.

87 files changed, 369 insertions, 369 deletions

diff --git a/mpbsd/mout.c b/mpbsd/mout.c
index af1844fb3..1cd670cea 100644
--- a/mpbsd/mout.c
+++ b/mpbsd/mout.c
@@ -35,7 +35,7 @@ mout (const MINT *x)
   unsigned char *str;
   size_t str_size;
   int i;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   x_size = x->_mp_size;
   if (x_size == 0)
@@ -50,7 +50,7 @@ mout (const MINT *x)
       x_size = -x_size;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
   x_ptr = x->_mp_d;
   MPN_SIZEINBASE (str_size, x_ptr, x_size, 10);
   str_size += 2;
@@ -89,5 +89,5 @@ mout (const MINT *x)
 	fputc (' ', stdout);
     }
   fputc ('\n', stdout);
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpbsd/xtom.c b/mpbsd/xtom.c
index d8521ccdb..d25a2462c 100644
--- a/mpbsd/xtom.c
+++ b/mpbsd/xtom.c
@@ -40,7 +40,7 @@ xtom (const char *str)
   int c;
   int negative;
   MINT *x = (MINT *) (*__gmp_allocate_func) (sizeof (MINT));
-  TMP_DECL (marker);
+  TMP_DECL;
 
   /* Skip whitespace.  */
   do
@@ -57,7 +57,7 @@ xtom (const char *str)
   if (digit_value[c] >= 16)
     return 0;			/* error if no digits */
 
-  TMP_MARK (marker);
+  TMP_MARK;
   str_size = strlen (str - 1);
   s = begs = (char *) TMP_ALLOC (str_size + 1);
 
@@ -68,7 +68,7 @@ xtom (const char *str)
 	  int dig = digit_value[c];
 	  if (dig >= 16)
 	    {
-	      TMP_FREE (marker);
+	      TMP_FREE;
 	      return 0;
 	    }
 	  *s++ = dig;
@@ -85,6 +85,6 @@ xtom (const char *str)
   xsize = mpn_set_str (x->_mp_d, (unsigned char *) begs, str_size, 16);
   x->_mp_size = negative ? -xsize : xsize;
 
-  TMP_FREE (marker);
+  TMP_FREE;
   return x;
 }
diff --git a/mpf/add.c b/mpf/add.c
index b0d88aad5..dcf17a228 100644
--- a/mpf/add.c
+++ b/mpf/add.c
@@ -33,7 +33,7 @@ mpf_add (mpf_ptr r, mpf_srcptr u, mpf_srcptr v)
   mp_size_t ediff;
   mp_limb_t cy;
   int negate;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   usize = u->_mp_size;
   vsize = v->_mp_size;
@@ -63,7 +63,7 @@ mpf_add (mpf_ptr r, mpf_srcptr u, mpf_srcptr v)
       return;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* Signs are now known to be the same.  */
   negate = usize < 0;
@@ -171,5 +171,5 @@ mpf_add (mpf_ptr r, mpf_srcptr u, mpf_srcptr v)
 
   r->_mp_size = negate ? -rsize : rsize;
   r->_mp_exp = uexp;
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpf/div.c b/mpf/div.c
index 32b39b442..e38b24a1f 100644
--- a/mpf/div.c
+++ b/mpf/div.c
@@ -63,7 +63,7 @@ mpf_div (mpf_ptr r, mpf_srcptr u, mpf_srcptr v)
   mp_size_t sign_quotient, prec, high_zero, chop;
   mp_exp_t rexp;
   int copy_u;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   usize = u->_mp_size;
   vsize = v->_mp_size;
@@ -82,7 +82,7 @@ mpf_div (mpf_ptr r, mpf_srcptr u, mpf_srcptr v)
       return;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
   rexp = u->_mp_exp - v->_mp_exp + 1;
 
   rp = r->_mp_d;
@@ -144,5 +144,5 @@ mpf_div (mpf_ptr r, mpf_srcptr u, mpf_srcptr v)
 
   r->_mp_size = sign_quotient >= 0 ? rsize : -rsize;
   r->_mp_exp = rexp;
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpf/div_ui.c b/mpf/div_ui.c
index fa261a9fb..2cad6265c 100644
--- a/mpf/div_ui.c
+++ b/mpf/div_ui.c
@@ -35,7 +35,7 @@ mpf_div_ui (mpf_ptr r, mpf_srcptr u, unsigned long int v)
   mp_size_t prec;
   mp_limb_t q_limb;
   mp_exp_t rexp;
-  TMP_DECL (marker);
+  TMP_DECL;
 
 #if BITS_PER_ULONG > GMP_NUMB_BITS  /* avoid warnings about shift amount */
   if (v > GMP_NUMB_MAX)
@@ -67,7 +67,7 @@ mpf_div_ui (mpf_ptr r, mpf_srcptr u, unsigned long int v)
       return;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   rp = r->_mp_d;
   up = u->_mp_d;
@@ -97,5 +97,5 @@ mpf_div_ui (mpf_ptr r, mpf_srcptr u, unsigned long int v)
   rexp = u->_mp_exp - (q_limb == 0);
   r->_mp_size = sign_quotient >= 0 ? rsize : -rsize;
   r->_mp_exp = rexp;
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpf/get_str.c b/mpf/get_str.c
index a5be33583..59f458502 100644
--- a/mpf/get_str.c
+++ b/mpf/get_str.c
@@ -122,7 +122,7 @@ mpf_get_str (char *dbuf, mp_exp_t *exp, int base, size_t n_digits, mpf_srcptr u)
   const char *num_to_text;
   size_t alloc_size = 0;
   char *dp;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   up = PTR(u);
   un = ABSIZ(u);
@@ -166,7 +166,7 @@ mpf_get_str (char *dbuf, mp_exp_t *exp, int base, size_t n_digits, mpf_srcptr u)
       goto done;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* Allocate temporary digit space.  We can't put digits directly in the user
      area, since we generate more digits than requested.  (We allocate
@@ -302,7 +302,7 @@ mpf_get_str (char *dbuf, mp_exp_t *exp, int base, size_t n_digits, mpf_srcptr u)
       n_digits++;
     }
 
-  TMP_FREE (marker);
+  TMP_FREE;
 
  done:
   /* If the string was alloced then resize it down to the actual space
diff --git a/mpf/mul.c b/mpf/mul.c
index 82632fa0c..f2f1e673e 100644
--- a/mpf/mul.c
+++ b/mpf/mul.c
@@ -29,9 +29,9 @@ mpf_mul (mpf_ptr r, mpf_srcptr u, mpf_srcptr v)
   mp_size_t usize, vsize;
   mp_size_t sign_product;
   mp_size_t prec = r->_mp_prec;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   usize = u->_mp_size;
   vsize = v->_mp_size;
   sign_product = usize ^ vsize;
@@ -83,5 +83,5 @@ mpf_mul (mpf_ptr r, mpf_srcptr u, mpf_srcptr v)
       r->_mp_exp = u->_mp_exp + v->_mp_exp - adj;
       r->_mp_size = sign_product >= 0 ? rsize : -rsize;
     }
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpf/out_str.c b/mpf/out_str.c
index 7d2add810..225985837 100644
--- a/mpf/out_str.c
+++ b/mpf/out_str.c
@@ -46,9 +46,9 @@ mpf_out_str (FILE *stream, int base, size_t n_digits, mpf_srcptr op)
   char *str;
   mp_exp_t exp;
   size_t written;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   if (base == 0)
     base = 10;
@@ -96,6 +96,6 @@ mpf_out_str (FILE *stream, int base, size_t n_digits, mpf_srcptr op)
     written += fpret;
   }
 
-  TMP_FREE (marker);
+  TMP_FREE;
   return ferror (stream) ? 0 : written;
 }
diff --git a/mpf/reldiff.c b/mpf/reldiff.c
index d26416cd5..ce8fecdec 100644
--- a/mpf/reldiff.c
+++ b/mpf/reldiff.c
@@ -38,9 +38,9 @@ mpf_reldiff (mpf_t rdiff, mpf_srcptr x, mpf_srcptr y)
     {
       mp_size_t dprec;
       mpf_t d;
-      TMP_DECL (marker);
+      TMP_DECL;
 
-      TMP_MARK (marker);
+      TMP_MARK;
       dprec = PREC(rdiff) + ABSIZ(x);
       ASSERT (PREC(rdiff)+1 == dprec - ABSIZ(x) + 1);
 
@@ -51,7 +51,7 @@ mpf_reldiff (mpf_t rdiff, mpf_srcptr x, mpf_srcptr y)
       SIZ(d) = ABSIZ(d);
       mpf_div (rdiff, d, x);
 
-      TMP_FREE (marker);
+      TMP_FREE;
     }
 }
 
diff --git a/mpf/set_q.c b/mpf/set_q.c
index de45883b3..197d7065b 100644
--- a/mpf/set_q.c
+++ b/mpf/set_q.c
@@ -69,7 +69,7 @@ mpf_set_q (mpf_t r, mpq_srcptr q)
   mp_size_t sign_quotient, high_zero;
   mp_ptr qp, tp, remp;
   mp_exp_t exp;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   ASSERT (SIZ(&q->_mp_den) > 0);  /* canonical q */
 
@@ -83,7 +83,7 @@ mpf_set_q (mpf_t r, mpq_srcptr q)
       return;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   prec = PREC (r);
   qp = PTR (r);
@@ -141,5 +141,5 @@ mpf_set_q (mpf_t r, mpq_srcptr q)
   EXP (r) = exp;
   SIZ (r) = sign_quotient >= 0 ? qsize : -qsize;
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpf/set_str.c b/mpf/set_str.c
index 75af1dacb..6e9ac7f90 100644
--- a/mpf/set_str.c
+++ b/mpf/set_str.c
@@ -124,7 +124,7 @@ mpf_set_str (mpf_ptr x, const char *str, int base)
   const char  *point = GMP_DECIMAL_POINT;
   size_t      pointlen = strlen (point);
   const unsigned char *digit_value;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   c = (unsigned char) *str;
 
@@ -186,7 +186,7 @@ mpf_set_str (mpf_ptr x, const char *str, int base)
 	}
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
   s = begs = (char *) TMP_ALLOC (str_size + 1);
 
   /* Loop through mantissa, converting it from ASCII to raw byte values.  */
@@ -205,7 +205,7 @@ mpf_set_str (mpf_ptr x, const char *str, int base)
 	      if (dotpos != 0)
 		{
 		  /* already saw a decimal point, another is invalid */
-		  TMP_FREE (marker);
+		  TMP_FREE;
 		  return -1;
 		}
 	      dotpos = s;
@@ -218,7 +218,7 @@ mpf_set_str (mpf_ptr x, const char *str, int base)
 	      dig = digit_value[c];
 	      if (dig >= base)
 		{
-		  TMP_FREE (marker);
+		  TMP_FREE;
 		  return -1;
 		}
 	      *s++ = dig;
@@ -259,7 +259,7 @@ mpf_set_str (mpf_ptr x, const char *str, int base)
       {
 	SIZ(x) = 0;
 	EXP(x) = 0;
-	TMP_FREE (marker);
+	TMP_FREE;
 	return 0;
       }
 
@@ -287,7 +287,7 @@ mpf_set_str (mpf_ptr x, const char *str, int base)
 	MPN_COPY (PTR(x), mp, mn);
 	SIZ(x) = negative ? -mn : mn;
 	EXP(x) = mn + madj;
-	TMP_FREE (marker);
+	TMP_FREE;
 	return 0;
       }
 
@@ -361,7 +361,7 @@ mpf_set_str (mpf_ptr x, const char *str, int base)
     MPN_COPY (PTR(x), tp, rn);
     SIZ(x) = negative ? -rn : rn;
     EXP(x) = exp_in_limbs;
-    TMP_FREE (marker);
+    TMP_FREE;
     return 0;
   }
 }
diff --git a/mpf/sqrt.c b/mpf/sqrt.c
index 0c3298c49..5654a41ad 100644
--- a/mpf/sqrt.c
+++ b/mpf/sqrt.c
@@ -57,7 +57,7 @@ mpf_sqrt (mpf_ptr r, mpf_srcptr u)
   mp_ptr up, tp;
   mp_size_t prec, tsize;
   mp_exp_t uexp, expodd;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   usize = u->_mp_size;
   if (usize <= 0)
@@ -69,7 +69,7 @@ mpf_sqrt (mpf_ptr r, mpf_srcptr u)
       return;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   uexp = u->_mp_exp;
   prec = r->_mp_prec;
@@ -99,5 +99,5 @@ mpf_sqrt (mpf_ptr r, mpf_srcptr u)
 
   mpn_sqrtrem (r->_mp_d, NULL, tp, tsize);
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpf/sqrt_ui.c b/mpf/sqrt_ui.c
index 6fb40d66d..4f2746550 100644
--- a/mpf/sqrt_ui.c
+++ b/mpf/sqrt_ui.c
@@ -63,7 +63,7 @@ mpf_sqrt_ui (mpf_ptr r, unsigned long int u)
   mp_size_t rsize, zeros;
   mp_ptr tp;
   mp_size_t prec;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   if (UNLIKELY (u == 0))
     {
@@ -72,7 +72,7 @@ mpf_sqrt_ui (mpf_ptr r, unsigned long int u)
       return;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   prec = r->_mp_prec;
   zeros = 2 * prec - 2;
@@ -95,5 +95,5 @@ mpf_sqrt_ui (mpf_ptr r, unsigned long int u)
 
   r->_mp_size = prec;
   r->_mp_exp = 1;
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpf/sub.c b/mpf/sub.c
index 0dcfbab24..d0f14e1c5 100644
--- a/mpf/sub.c
+++ b/mpf/sub.c
@@ -33,7 +33,7 @@ mpf_sub (mpf_ptr r, mpf_srcptr u, mpf_srcptr v)
   mp_exp_t exp;
   mp_size_t ediff;
   int negate;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   usize = u->_mp_size;
   vsize = v->_mp_size;
@@ -62,7 +62,7 @@ mpf_sub (mpf_ptr r, mpf_srcptr u, mpf_srcptr v)
       return;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* Signs are now known to be the same.  */
   negate = usize < 0;
@@ -407,5 +407,5 @@ general_case:
   if (rsize == 0)
     exp = 0;
   r->_mp_exp = exp;
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpf/ui_div.c b/mpf/ui_div.c
index ba1552c25..c001b614d 100644
--- a/mpf/ui_div.c
+++ b/mpf/ui_div.c
@@ -36,7 +36,7 @@ mpf_ui_div (mpf_ptr r, unsigned long int u, mpf_srcptr v)
   mp_size_t sign_quotient;
   mp_size_t prec;
   mp_exp_t rexp;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   vsize = v->_mp_size;
   sign_quotient = vsize;
@@ -53,7 +53,7 @@ mpf_ui_div (mpf_ptr r, unsigned long int u, mpf_srcptr v)
       return;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
   rexp = 1 - v->_mp_exp + 1;
 
   rp = r->_mp_d;
@@ -114,5 +114,5 @@ mpf_ui_div (mpf_ptr r, unsigned long int u, mpf_srcptr v)
 
   r->_mp_size = sign_quotient >= 0 ? rsize : -rsize;
   r->_mp_exp = rexp;
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpf/ui_sub.c b/mpf/ui_sub.c
index 93cdfc1f8..3fe422c1e 100644
--- a/mpf/ui_sub.c
+++ b/mpf/ui_sub.c
@@ -33,7 +33,7 @@ mpf_ui_sub (mpf_ptr r, unsigned long int u, mpf_srcptr v)
   mp_size_t ediff;
   int negate;
   mp_limb_t ulimb;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   vsize = v->_mp_size;
 
@@ -60,7 +60,7 @@ mpf_ui_sub (mpf_ptr r, unsigned long int u, mpf_srcptr v)
       return;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* Signs are now known to be the same.  */
 
@@ -323,5 +323,5 @@ mpf_ui_sub (mpf_ptr r, unsigned long int u, mpf_srcptr v)
  done:
   r->_mp_size = negate ? -rsize : rsize;
   r->_mp_exp = uexp;
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpn/generic/dc_divrem_n.c b/mpn/generic/dc_divrem_n.c
index 4855d0512..240d694d7 100644
--- a/mpn/generic/dc_divrem_n.c
+++ b/mpn/generic/dc_divrem_n.c
@@ -50,13 +50,13 @@ mpn_dc_divrem_n (mp_ptr qp, mp_ptr np, mp_srcptr dp, mp_size_t n)
 {
   mp_limb_t ret;
   mp_ptr scratch;
-  TMP_DECL (marker);
-  TMP_MARK (marker);
+  TMP_DECL;
+  TMP_MARK;
 
   scratch = TMP_ALLOC_LIMBS (n);
   ret = mpn_dc_div_2_by_1 (qp, np, dp, n, scratch);
 
-  TMP_FREE (marker);
+  TMP_FREE;
   return ret;
 }
 
diff --git a/mpn/generic/divis.c b/mpn/generic/divis.c
index eaf5aa6d0..83d5e87b4 100644
--- a/mpn/generic/divis.c
+++ b/mpn/generic/divis.c
@@ -73,7 +73,7 @@ mpn_divisible_p (mp_srcptr ap, mp_size_t asize,
   mp_limb_t  alow, dlow, dmask;
   mp_ptr     qp, rp;
   mp_size_t  i;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   ASSERT (asize >= 0);
   ASSERT (asize == 0 || ap[asize-1] != 0);
@@ -138,7 +138,7 @@ mpn_divisible_p (mp_srcptr ap, mp_size_t asize,
 	}
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   rp = TMP_ALLOC_LIMBS (asize+1);
   qp = rp + dsize;
@@ -151,12 +151,12 @@ mpn_divisible_p (mp_srcptr ap, mp_size_t asize,
     {
       if (rp[i] != 0)
 	{
-	  TMP_FREE (marker);
+	  TMP_FREE;
 	  return 0;
 	}
     }
   while (++i < dsize);
 
-  TMP_FREE (marker);
+  TMP_FREE;
   return 1;
 }
diff --git a/mpn/generic/divrem.c b/mpn/generic/divrem.c
index 315f6dbe3..00a97f067 100644
--- a/mpn/generic/divrem.c
+++ b/mpn/generic/divrem.c
@@ -46,9 +46,9 @@ mpn_divrem (mp_ptr qp, mp_size_t qxn,
       mp_limb_t ret;
       mp_ptr q2p;
       mp_size_t qn;
-      TMP_DECL (marker);
+      TMP_DECL;
 
-      TMP_MARK (marker);
+      TMP_MARK;
       q2p = (mp_ptr) TMP_ALLOC ((nn + qxn) * BYTES_PER_MP_LIMB);
 
       np[0] = mpn_divrem_1 (q2p, qxn, np, nn, dp[0]);
@@ -56,7 +56,7 @@ mpn_divrem (mp_ptr qp, mp_size_t qxn,
       MPN_COPY (qp, q2p, qn);
       ret = q2p[qn];
 
-      TMP_FREE (marker);
+      TMP_FREE;
       return ret;
     }
   else if (dn == 2)
@@ -68,9 +68,9 @@ mpn_divrem (mp_ptr qp, mp_size_t qxn,
       mp_ptr rp, q2p;
       mp_limb_t qhl;
       mp_size_t qn;
-      TMP_DECL (marker);
+      TMP_DECL;
 
-      TMP_MARK (marker);
+      TMP_MARK;
       if (qxn != 0)
 	{
 	  mp_ptr n2p;
@@ -95,7 +95,7 @@ mpn_divrem (mp_ptr qp, mp_size_t qxn,
 	  MPN_COPY (qp, q2p, qn);
 	  qhl = q2p[qn];
 	}
-      TMP_FREE (marker);
+      TMP_FREE;
       return qhl;
     }
 }
diff --git a/mpn/generic/dump.c b/mpn/generic/dump.c
index 20c5f0808..947a4fd9b 100644
--- a/mpn/generic/dump.c
+++ b/mpn/generic/dump.c
@@ -82,11 +82,11 @@ void
 mpn_dump (mp_srcptr p, mp_size_t n)
 {
   mp_ptr tp;
-  TMP_DECL (marker);
-  TMP_MARK (marker);
+  TMP_DECL;
+  TMP_MARK;
   tp = TMP_ALLOC_LIMBS (n);
   MPN_COPY (tp, p, n);
-  TMP_FREE (marker);
+  TMP_FREE;
 }
 
 #endif
diff --git a/mpn/generic/fib2_ui.c b/mpn/generic/fib2_ui.c
index ed33432dd..1e23aa3f3 100644
--- a/mpn/generic/fib2_ui.c
+++ b/mpn/generic/fib2_ui.c
@@ -67,7 +67,7 @@ mpn_fib2_ui (mp_ptr fp, mp_ptr f1p, unsigned long int n)
   mp_ptr         xp, yp;
   mp_size_t      size;
   unsigned long  nfirst, mask;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   TRACE (printf ("mpn_fib2_ui n=%lu\n", n));
 
@@ -88,7 +88,7 @@ mpn_fib2_ui (mp_ptr fp, mp_ptr f1p, unsigned long int n)
     {
       mp_size_t  alloc;
 
-      TMP_MARK (marker);
+      TMP_MARK;
       alloc = MPN_FIB2_SIZE (n);
       TMP_ALLOC_LIMBS_2 (xp,alloc, yp,alloc);
 
@@ -158,7 +158,7 @@ mpn_fib2_ui (mp_ptr fp, mp_ptr f1p, unsigned long int n)
 	}
       while (mask != 1);
 
-      TMP_FREE (marker);
+      TMP_FREE;
     }
 
   TRACE (printf ("done size=%ld\n", size);
diff --git a/mpn/generic/gcd.c b/mpn/generic/gcd.c
index 4ca063c55..ff251dd7c 100644
--- a/mpn/generic/gcd.c
+++ b/mpn/generic/gcd.c
@@ -190,7 +190,7 @@ gcd_binary_odd (mp_ptr gp, mp_ptr up, mp_size_t usize, mp_ptr vp, mp_size_t vsiz
   mp_ptr orig_vp = vp;
   mp_size_t orig_vsize = vsize;
   int binary_gcd_ctr;		/* Number of times binary gcd will execute.  */
-  TMP_DECL (marker);
+  TMP_DECL;
 
   ASSERT (usize >= 1);
   ASSERT (vsize >= 1);
@@ -211,7 +211,7 @@ gcd_binary_odd (mp_ptr gp, mp_ptr up, mp_size_t usize, mp_ptr vp, mp_size_t vsiz
   ASSERT (MPN_SAME_OR_SEPARATE2_P (gp, vsize, up, usize));
   ASSERT (MPN_SAME_OR_SEPARATE2_P (gp, vsize, vp, vsize));
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* Use accelerated algorithm if vsize is over GCD_ACCEL_THRESHOLD.
      Two EXTRA limbs for U and V are required for kary reduction.  */
@@ -439,7 +439,7 @@ gcd_binary_odd (mp_ptr gp, mp_ptr up, mp_size_t usize, mp_ptr vp, mp_size_t vsiz
 done:
   if (vp != gp)
     MPN_COPY_INCR (gp, vp, vsize);
-  TMP_FREE (marker);
+  TMP_FREE;
   return vsize;
 }
 
@@ -843,15 +843,15 @@ mpn_gcd (mp_ptr gp, mp_ptr up, mp_size_t usize, mp_ptr vp, mp_size_t vsize)
       mp_size_t scratch;
       mp_ptr tp;
       mp_size_t gsize;
-      TMP_DECL (marker);
+      TMP_DECL;
 
-      TMP_MARK (marker);
+      TMP_MARK;
 
       scratch = GCD_LEHMER_ITCH (usize);
       tp = TMP_ALLOC_LIMBS (scratch);
 
       gsize = gcd_lehmer (gp, up, usize, vp, vsize, tp, scratch);
-      TMP_FREE (marker);
+      TMP_FREE;
       return gsize;
     }
   else
diff --git a/mpn/generic/gcdext.c b/mpn/generic/gcdext.c
index 9e917fa77..3c863a6ad 100644
--- a/mpn/generic/gcdext.c
+++ b/mpn/generic/gcdext.c
@@ -932,7 +932,7 @@ sanity_check_row (mp_srcptr ap, mp_size_t asize,
   mp_ptr rp;
   mp_size_t i;
 
-  TMP_DECL (marker);
+  TMP_DECL;
 
   ASSERT (asize > 0 && ap[asize - 1] != 0);
   ASSERT (bsize > 0 && bp[bsize - 1] != 0);
@@ -976,7 +976,7 @@ sanity_check_row (mp_srcptr ap, mp_size_t asize,
       qsize += (qp[qsize] != 0);
       ASSERT (MPN_LEQ_P (qp, qsize, ap, asize));
     }
-  TMP_FREE (marker);
+  TMP_FREE;
 }
 # define ASSERT_ROW(ap, asize, bp, bsize, sign, usize, r) \
 sanity_check_row (ap, asize, bp, bsize, sign, usize, r)
@@ -1285,13 +1285,13 @@ mpn_gcdext (mp_ptr gp, mp_ptr up, mp_size_t *usizep,
       mp_size_t gsize;
       mp_ptr tp;
       mp_size_t talloc = gcdext_lehmer_itch (asize, bsize);
-      TMP_DECL (marker);
-      TMP_MARK (marker);
+      TMP_DECL;
+      TMP_MARK;
 
       tp = TMP_ALLOC_LIMBS (talloc);
       gsize = gcdext_lehmer (gp, up, usizep, ap, asize, bp, bsize,
 			     tp, talloc);
-      TMP_FREE (marker);
+      TMP_FREE;
       return gsize;
     }
   else
@@ -1299,13 +1299,13 @@ mpn_gcdext (mp_ptr gp, mp_ptr up, mp_size_t *usizep,
       mp_size_t gsize;
       mp_ptr tp;
       mp_size_t talloc = gcdext_schoenhage_itch (asize, bsize);
-      TMP_DECL (marker);
-      TMP_MARK (marker);
+      TMP_DECL;
+      TMP_MARK;
 
       tp = TMP_ALLOC_LIMBS (talloc);
       gsize = gcdext_schoenhage (gp, up, usizep, ap, asize, bp, bsize,
 				 tp, talloc);
-      TMP_FREE (marker);
+      TMP_FREE;
       return gsize;
     }
 }
diff --git a/mpn/generic/mul.c b/mpn/generic/mul.c
index 3dbf6f539..d3f4c619a 100644
--- a/mpn/generic/mul.c
+++ b/mpn/generic/mul.c
@@ -133,8 +133,8 @@ mpn_mul (mp_ptr prodp,
   if (un != vn)
     { mp_limb_t t;
       mp_ptr ws;
-      TMP_DECL (marker);
-      TMP_MARK (marker);
+      TMP_DECL;
+      TMP_MARK;
 
       prodp += vn;
       l = vn;
@@ -194,7 +194,7 @@ mpn_mul (mp_ptr prodp,
 	    }
 	}
 
-      TMP_FREE (marker);
+      TMP_FREE;
     }
   return prodp[un + vn - 1];
 }
diff --git a/mpn/generic/mul_fft.c b/mpn/generic/mul_fft.c
index 53a833a31..94794af74 100644
--- a/mpn/generic/mul_fft.c
+++ b/mpn/generic/mul_fft.c
@@ -322,9 +322,9 @@ mpn_fft_fft_sqr (mp_ptr *Ap, mp_size_t K, int **ll,
       int j, inc2 = 2 * inc;
       int *lk = *ll;
       mp_ptr tmp;
-      TMP_DECL(marker);
+      TMP_DECL;
 
-      TMP_MARK(marker);
+      TMP_MARK;
       tmp = TMP_ALLOC_LIMBS (n + 1);
       mpn_fft_fft_sqr (Ap, K/2,ll-1,2 * omega,n,inc2, tp);
       mpn_fft_fft_sqr (Ap+inc, K/2,ll-1,2 * omega,n,inc2, tp);
@@ -339,7 +339,7 @@ mpn_fft_fft_sqr (mp_ptr *Ap, mp_size_t K, int **ll,
           mpn_fft_add_modF      (Ap[inc], Ap[0], tp, n);
           mpn_fft_add_modF      (Ap[0], Ap[0], tmp, n);
 	}
-      TMP_FREE(marker);
+      TMP_FREE;
     }
 }
 
@@ -453,9 +453,9 @@ mpn_fft_mul_modF_K (mp_ptr *ap, mp_ptr *bp, mp_size_t n, int K)
 {
   int i;
   int sqr = (ap == bp);
-  TMP_DECL(marker);
+  TMP_DECL;
 
-  TMP_MARK(marker);
+  TMP_MARK;
 
   if (n >= (sqr ? SQR_FFT_MODF_THRESHOLD : MUL_FFT_MODF_THRESHOLD))
     {
@@ -540,7 +540,7 @@ mpn_fft_mul_modF_K (mp_ptr *ap, mp_ptr *bp, mp_size_t n, int K)
 	  a[n] = mpn_sub_n (a, tp, tpn, n) && mpn_add_1 (a, a, n, CNST_LIMB(1));
 	}
     }
-  TMP_FREE(marker);
+  TMP_FREE;
 }
 
 
@@ -572,9 +572,9 @@ mpn_fft_fftinv (mp_ptr *Ap, int K, mp_size_t omega, mp_size_t n, mp_ptr tp)
     {
       int j, K2 = K / 2;
       mp_ptr *Bp = Ap + K2, tmp;
-      TMP_DECL(marker);
+      TMP_DECL;
 
-      TMP_MARK(marker);
+      TMP_MARK;
       tmp = TMP_ALLOC_LIMBS (n + 1);
       mpn_fft_fftinv (Ap, K2, 2 * omega, n, tp);
       mpn_fft_fftinv (Bp, K2, 2 * omega, n, tp);
@@ -590,7 +590,7 @@ mpn_fft_fftinv (mp_ptr *Ap, int K, mp_size_t omega, mp_size_t n, mp_ptr tp)
           mpn_fft_add_modF      (Bp[0], Ap[0], tp, n);
           mpn_fft_add_modF      (Ap[0], Ap[0], tmp, n);
 	}
-      TMP_FREE(marker);
+      TMP_FREE;
     }
 }
 
@@ -661,8 +661,8 @@ mpn_mul_fft_decompose (mp_ptr A, mp_ptr *Ap, int K, int nprime, mp_srcptr n,
   int i, j, cc;
   mp_ptr tmp;
   mp_size_t Kl = K * l;
-  TMP_DECL(marker);
-  TMP_MARK(marker);
+  TMP_DECL;
+  TMP_MARK;
 
   ASSERT_ALWAYS (nl <= 2 * Kl);
   if (nl > Kl) /* normalize {n, nl} mod 2^(Kl*GMP_NUMB_BITS)+1 */
@@ -697,7 +697,7 @@ mpn_mul_fft_decompose (mp_ptr A, mp_ptr *Ap, int K, int nprime, mp_srcptr n,
       A += nprime + 1;
     }
   ASSERT_ALWAYS (nl == 0);
-  TMP_FREE(marker);
+  TMP_FREE;
 }
 
 /* op <- n*m mod 2^N+1 with fft of size 2^k where N=pl*GMP_NUMB_BITS
@@ -838,12 +838,12 @@ mpn_mul_fft (mp_ptr op, mp_size_t pl,
   mp_ptr *Ap, *Bp, A, T, B;
   int **_fft_l;
   int sqr = (n == m && nl == ml);
-  TMP_DECL(marker);
+  TMP_DECL;
 
   TRACE (printf ("\nmpn_mul_fft pl=%ld nl=%ld ml=%ld k=%d\n", pl, nl, ml, k));
   ASSERT_ALWAYS (mpn_fft_next_size (pl, k) == pl);
 
-  TMP_MARK(marker);
+  TMP_MARK;
   N = pl * GMP_NUMB_BITS;
   _fft_l = TMP_ALLOC_TYPE (k + 1, int*);
   for (i = 0; i <= k; i++)
@@ -894,7 +894,7 @@ mpn_mul_fft (mp_ptr op, mp_size_t pl,
 
   i = mpn_mul_fft_internal (op, n, m, pl, k, K, Ap, Bp, A, B, nprime, l, Mp, _fft_l, T, 0);
 
-  TMP_FREE(marker);
+  TMP_FREE;
   __GMP_FREE_FUNC_LIMBS (A, 2 * K * (nprime + 1));
 
   return i;
@@ -962,14 +962,14 @@ mpn_mul_fft_full (mp_ptr op,
 #else
   {
     mp_ptr tmp;
-    TMP_DECL(marker);
+    TMP_DECL;
 
-    TMP_MARK(marker);
+    TMP_MARK;
     tmp = TMP_ALLOC_LIMBS (l);
     MPN_COPY (tmp, pad_op, l);
     c2 = mpn_sub_n (pad_op,      pad_op, pad_op + l, l);
     cc += mpn_add_n (pad_op + l, tmp,    pad_op + l, l);
-    TMP_FREE(marker);
+    TMP_FREE;
   }
 #endif
   c2 += oldcc;
diff --git a/mpn/generic/mul_n.c b/mpn/generic/mul_n.c
index 3e8471947..ed0eab505 100644
--- a/mpn/generic/mul_n.c
+++ b/mpn/generic/mul_n.c
@@ -866,12 +866,12 @@ mpn_mul_n (mp_ptr p, mp_srcptr a, mp_srcptr b, mp_size_t n)
 #endif
     {
       mp_ptr ws;
-      TMP_DECL (marker);
-      TMP_MARK (marker);
+      TMP_DECL;
+      TMP_MARK;
       /* Allocate workspace with TMP_ALLOC interface: fast. */
       ws = TMP_ALLOC_LIMBS (MPN_TOOM3_MUL_N_TSIZE (n));
       mpn_toom3_mul_n (p, a, b, n, ws);
-      TMP_FREE (marker);
+      TMP_FREE;
     }
   else
 #if WANT_FFT || TUNE_PROGRAM_BUILD
@@ -917,11 +917,11 @@ mpn_sqr_n (mp_ptr p, mp_srcptr a, mp_size_t n)
   else if (BELOW_THRESHOLD (n, SQR_TOOM3_THRESHOLD))
     { /* karatsuba multiplication */
       mp_ptr ws;
-      TMP_DECL (marker);
-      TMP_MARK (marker);
+      TMP_DECL;
+      TMP_MARK;
       ws = TMP_ALLOC_LIMBS (MPN_KARA_SQR_N_TSIZE (n));
       mpn_kara_sqr_n (p, a, n, ws);
-      TMP_FREE (marker);
+      TMP_FREE;
     }
 #if WANT_FFT || TUNE_PROGRAM_BUILD
   else if (BELOW_THRESHOLD (n, SQR_FFT_THRESHOLD))
@@ -930,12 +930,12 @@ mpn_sqr_n (mp_ptr p, mp_srcptr a, mp_size_t n)
 #endif
     {
       mp_ptr ws;
-      TMP_DECL (marker);
-      TMP_MARK (marker);
+      TMP_DECL;
+      TMP_MARK;
       /* Allocate workspace with TMP_ALLOC interface: fast. */
       ws = TMP_ALLOC_LIMBS (MPN_TOOM3_SQR_N_TSIZE (n));
       mpn_toom3_sqr_n (p, a, n, ws);
-      TMP_FREE (marker);
+      TMP_FREE;
     }
   else
 #if WANT_FFT || TUNE_PROGRAM_BUILD
diff --git a/mpn/generic/mullow_n.c b/mpn/generic/mullow_n.c
index 3d161395e..17056f165 100644
--- a/mpn/generic/mullow_n.c
+++ b/mpn/generic/mullow_n.c
@@ -62,13 +62,13 @@ mpn_mullow_n (mp_ptr rp, mp_srcptr xp, mp_srcptr yp, mp_size_t n)
   if (BELOW_THRESHOLD (n, MULLOW_BASECASE_THRESHOLD))
     {
       mp_ptr tp;
-      TMP_DECL (marker);
-      TMP_MARK (marker);
+      TMP_DECL;
+      TMP_MARK;
       tp = TMP_ALLOC_LIMBS (2 * n);
 
       mpn_mul_basecase (tp, xp, n, yp, n);
       MPN_COPY (rp, tp, n);
-      TMP_FREE (marker);
+      TMP_FREE;
     }
   else if (BELOW_THRESHOLD (n, MULLOW_DC_THRESHOLD))
     {
@@ -80,8 +80,8 @@ mpn_mullow_n (mp_ptr rp, mp_srcptr xp, mp_srcptr yp, mp_size_t n)
       mp_size_t n1 = (n+1) >> 1;	/* ceil(n/2) */
       mp_size_t n2 = n - n1;		/* floor(n/2) */
       mp_ptr tp;
-      TMP_DECL (marker);
-      TMP_MARK (marker);
+      TMP_DECL;
+      TMP_MARK;
       tp = TMP_ALLOC_LIMBS (n1);
 
       /* Split as x = x1 2^(n1 GMP_NUMB_BITS) + x0,
@@ -99,19 +99,19 @@ mpn_mullow_n (mp_ptr rp, mp_srcptr xp, mp_srcptr yp, mp_size_t n)
       /* x0 * y1 * 2^(n2 GMP_NUMB_BITS) */
       mpn_mullow_n (tp, yp + n2, xp, n1);
       mpn_add_n (rp + n2, rp + n2, tp, n1);
-      TMP_FREE (marker);
+      TMP_FREE;
     }
   else
     {
       /* For really large operands, use plain mpn_mul_n but through away upper
 	 n limbs of result.  */
       mp_ptr tp;
-      TMP_DECL (marker);
-      TMP_MARK (marker);
+      TMP_DECL;
+      TMP_MARK;
       tp = TMP_ALLOC_LIMBS (2 * n);
 
       mpn_mul_n (tp, xp, yp, n);
       MPN_COPY (rp, tp, n);
-      TMP_FREE (marker);
+      TMP_FREE;
     }
 }
diff --git a/mpn/generic/perfsqr.c b/mpn/generic/perfsqr.c
index 5c7066db1..151d05363 100644
--- a/mpn/generic/perfsqr.c
+++ b/mpn/generic/perfsqr.c
@@ -217,14 +217,14 @@ mpn_perfect_square_p (mp_srcptr up, mp_size_t usize)
   {
     mp_ptr root_ptr;
     int res;
-    TMP_DECL (marker);
+    TMP_DECL;
 
-    TMP_MARK (marker);
+    TMP_MARK;
     root_ptr = (mp_ptr) TMP_ALLOC ((usize + 1) / 2 * BYTES_PER_MP_LIMB);
 
     /* Iff mpn_sqrtrem returns zero, the square is perfect.  */
     res = ! mpn_sqrtrem (root_ptr, NULL, up, usize);
-    TMP_FREE (marker);
+    TMP_FREE;
 
     return res;
   }
diff --git a/mpn/generic/rootrem.c b/mpn/generic/rootrem.c
index 627166508..5d275d16d 100644
--- a/mpn/generic/rootrem.c
+++ b/mpn/generic/rootrem.c
@@ -62,9 +62,9 @@ mpn_rootrem (mp_ptr rootp, mp_ptr remp,
   unsigned int cnt;
   mp_size_t i;
   unsigned long int n_valid_bits, adj;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* The extra factor 1.585 = log(3)/log(2) here is for the worst case
      overestimate of the root, i.e., when the code rounds a root that is
@@ -88,7 +88,7 @@ mpn_rootrem (mp_ptr rootp, mp_ptr remp,
       mpn_sub_1 (remp, up, un, (mp_limb_t) 1);
       MPN_NORMALIZE (remp, un);
       rootp[0] = 1;
-      TMP_FREE (marker);
+      TMP_FREE;
       return un;
     }
 
@@ -172,6 +172,6 @@ mpn_rootrem (mp_ptr rootp, mp_ptr remp,
   mpn_sub (remp, up, un, pp, pn);
   MPN_NORMALIZE (remp, un);
   MPN_COPY (rootp, xp, xn);
-  TMP_FREE (marker);
+  TMP_FREE;
   return un;
 }
diff --git a/mpn/generic/sqrtrem.c b/mpn/generic/sqrtrem.c
index 69807b569..5ec5f339f 100644
--- a/mpn/generic/sqrtrem.c
+++ b/mpn/generic/sqrtrem.c
@@ -212,7 +212,7 @@ mpn_sqrtrem (mp_ptr sp, mp_ptr rp, mp_srcptr np, mp_size_t nn)
   mp_limb_t *tp, s0[1], cc, high, rl;
   int c;
   mp_size_t rn, tn;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   ASSERT (nn >= 0);
   ASSERT_MPN (np, nn);
@@ -235,7 +235,7 @@ mpn_sqrtrem (mp_ptr sp, mp_ptr rp, mp_srcptr np, mp_size_t nn)
   c = c / 2; /* we have to shift left by 2c bits to normalize {np, nn} */
   tn = (nn + 1) / 2; /* 2*tn is the smallest even integer >= nn */
 
-  TMP_MARK (marker);
+  TMP_MARK;
   if (nn % 2 != 0 || c > 0)
     {
       tp = TMP_ALLOC_LIMBS (2 * tn);
@@ -281,6 +281,6 @@ mpn_sqrtrem (mp_ptr sp, mp_ptr rp, mp_srcptr np, mp_size_t nn)
 
   MPN_NORMALIZE (rp, rn);
 
-  TMP_FREE (marker);
+  TMP_FREE;
   return rn;
 }
diff --git a/mpn/generic/tdiv_qr.c b/mpn/generic/tdiv_qr.c
index 22ba4aee5..658fb2005 100644
--- a/mpn/generic/tdiv_qr.c
+++ b/mpn/generic/tdiv_qr.c
@@ -68,8 +68,8 @@ mpn_tdiv_qr (mp_ptr qp, mp_ptr rp, mp_size_t qxn,
       {
 	mp_ptr n2p, d2p;
 	mp_limb_t qhl, cy;
-	TMP_DECL (marker);
-	TMP_MARK (marker);
+	TMP_DECL;
+	TMP_MARK;
 	if ((dp[1] & GMP_NUMB_HIGHBIT) == 0)
 	  {
 	    int cnt;
@@ -99,15 +99,15 @@ mpn_tdiv_qr (mp_ptr qp, mp_ptr rp, mp_size_t qxn,
             rp[0] = n2p[0];
             rp[1] = n2p[1];
 	  }
-	TMP_FREE (marker);
+	TMP_FREE;
 	return;
       }
 
     default:
       {
 	int adjust;
-	TMP_DECL (marker);
-	TMP_MARK (marker);
+	TMP_DECL;
+	TMP_MARK;
 	adjust = np[nn - 1] >= dp[dn - 1];	/* conservative tests for quotient size */
 	if (nn + adjust >= 2 * dn)
 	  {
@@ -180,7 +180,7 @@ mpn_tdiv_qr (mp_ptr qp, mp_ptr rp, mp_size_t qxn,
 	      mpn_rshift (rp, n2p, dn, cnt);
 	    else
 	      MPN_COPY (rp, n2p, dn);
-	    TMP_FREE (marker);
+	    TMP_FREE;
 	    return;
 	  }
 
@@ -235,7 +235,7 @@ mpn_tdiv_qr (mp_ptr qp, mp_ptr rp, mp_size_t qxn,
 	    if (qn == 0)
 	      {
 		MPN_COPY (rp, np, dn);
-		TMP_FREE (marker);
+		TMP_FREE;
 		return;
 	      }
 
@@ -397,7 +397,7 @@ mpn_tdiv_qr (mp_ptr qp, mp_ptr rp, mp_size_t qxn,
 		mpn_add_n (rp, rp, dp, dn);
 	      }
 	  }
-	TMP_FREE (marker);
+	TMP_FREE;
 	return;
       }
     }
diff --git a/mpq/aors.c b/mpq/aors.c
index 1b3c2f56d..d389a2873 100644
--- a/mpq/aors.c
+++ b/mpq/aors.c
@@ -37,9 +37,9 @@ mpq_aors (mpq_ptr rop, mpq_srcptr op1, mpq_srcptr op2,
   mp_size_t op1_den_size =      op1->_mp_den._mp_size;
   mp_size_t op2_num_size = ABS (op2->_mp_num._mp_size);
   mp_size_t op2_den_size =      op2->_mp_den._mp_size;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   MPZ_TMP_INIT (gcd, MIN (op1_den_size, op2_den_size));
   MPZ_TMP_INIT (tmp1, op1_num_size + op2_den_size);
   MPZ_TMP_INIT (tmp2, op2_num_size + op1_den_size);
@@ -87,7 +87,7 @@ mpq_aors (mpq_ptr rop, mpq_srcptr op1, mpq_srcptr op2,
       (*fun) (&(rop->_mp_num), tmp1, tmp2);
       mpz_mul (&(rop->_mp_den), &(op1->_mp_den), &(op2->_mp_den));
     }
-  TMP_FREE (marker);
+  TMP_FREE;
 }
 
 
diff --git a/mpq/canonicalize.c b/mpq/canonicalize.c
index a47cc0460..483897765 100644
--- a/mpq/canonicalize.c
+++ b/mpq/canonicalize.c
@@ -27,12 +27,12 @@ void
 mpq_canonicalize (MP_RAT *op)
 {
   mpz_t gcd;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   if (op->_mp_den._mp_size == 0)
     DIVIDE_BY_ZERO;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* ??? Dunno if the 1+ is needed.  */
   MPZ_TMP_INIT (gcd, 1 + MAX (ABS (op->_mp_num._mp_size),
@@ -50,5 +50,5 @@ mpq_canonicalize (MP_RAT *op)
       op->_mp_num._mp_size = -op->_mp_num._mp_size;
       op->_mp_den._mp_size = -op->_mp_den._mp_size;
     }
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpq/cmp.c b/mpq/cmp.c
index 47340c9e2..56a33111f 100644
--- a/mpq/cmp.c
+++ b/mpq/cmp.c
@@ -35,7 +35,7 @@ mpq_cmp (const MP_RAT *op1, const MP_RAT *op2)
   mp_ptr tmp1_ptr, tmp2_ptr;
   mp_size_t num1_sign;
   int cc;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   /* need canonical signs to get right result */
   ASSERT (den1_size > 0);
@@ -88,7 +88,7 @@ mpq_cmp (const MP_RAT *op1, const MP_RAT *op2)
 
   /* 3. Finally, cross multiply and compare.  */
 
-  TMP_MARK (marker);
+  TMP_MARK;
   TMP_ALLOC_LIMBS_2 (tmp1_ptr,tmp1_size, tmp2_ptr,tmp2_size);
 
   if (num1_size >= den2_size)
@@ -112,6 +112,6 @@ mpq_cmp (const MP_RAT *op1, const MP_RAT *op2)
 
   cc = tmp1_size - tmp2_size != 0
     ? tmp1_size - tmp2_size : mpn_cmp (tmp1_ptr, tmp2_ptr, tmp1_size);
-  TMP_FREE (marker);
+  TMP_FREE;
   return num1_sign < 0 ? -cc : cc;
 }
diff --git a/mpq/cmp_ui.c b/mpq/cmp_ui.c
index dbed7004e..9694cafab 100644
--- a/mpq/cmp_ui.c
+++ b/mpq/cmp_ui.c
@@ -34,7 +34,7 @@ _mpq_cmp_ui (const MP_RAT *op1, unsigned long int num2, unsigned long int den2)
   mp_ptr tmp1_ptr, tmp2_ptr;
   mp_limb_t cy_limb;
   int cc;
-  TMP_DECL (marker);
+  TMP_DECL;
 
 #if GMP_NAIL_BITS != 0
   if ((num2 | den2) > GMP_NUMB_MAX)
@@ -71,7 +71,7 @@ _mpq_cmp_ui (const MP_RAT *op1, unsigned long int num2, unsigned long int den2)
     /* NUM1 x DEN2 is surely smaller in magnitude than NUM2 x DEN1.  */
     return -num1_size;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   tmp1_ptr = (mp_ptr) TMP_ALLOC ((num1_size + 1) * BYTES_PER_MP_LIMB);
   tmp2_ptr = (mp_ptr) TMP_ALLOC ((den1_size + 1) * BYTES_PER_MP_LIMB);
 
@@ -87,6 +87,6 @@ _mpq_cmp_ui (const MP_RAT *op1, unsigned long int num2, unsigned long int den2)
 
   cc = tmp1_size - tmp2_size != 0
     ? tmp1_size - tmp2_size : mpn_cmp (tmp1_ptr, tmp2_ptr, tmp1_size);
-  TMP_FREE (marker);
+  TMP_FREE;
   return cc;
 }
diff --git a/mpq/get_d.c b/mpq/get_d.c
index 9a037fed7..41aeebf77 100644
--- a/mpq/get_d.c
+++ b/mpq/get_d.c
@@ -105,7 +105,7 @@ mpq_get_d (const MP_RAT *src)
 #define N_QLIMBS (1 + (sizeof (double) + BYTES_PER_MP_LIMB-1) / BYTES_PER_MP_LIMB)
   mp_limb_t qarr[N_QLIMBS + 1];
   mp_ptr qp = qarr;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   ASSERT (dsize > 0);    /* canonical src */
 
@@ -113,7 +113,7 @@ mpq_get_d (const MP_RAT *src)
   if (UNLIKELY (nsize == 0))
     return 0.0;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   nsize = ABS (nsize);
   dsize = ABS (dsize);
   np = src->_mp_num._mp_d;
@@ -161,6 +161,6 @@ mpq_get_d (const MP_RAT *src)
   qsize -= (qp[qsize-1] == 0);
 
   res = mpn_get_d (qp, qsize, sign_quotient, exp);
-  TMP_FREE (marker);
+  TMP_FREE;
   return res;
 }
diff --git a/mpz/and.c b/mpz/and.c
index 106cf52d5..b776ab83c 100644
--- a/mpz/and.c
+++ b/mpz/and.c
@@ -31,9 +31,9 @@ mpz_and (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
   mp_ptr res_ptr;
   mp_size_t res_size;
   mp_size_t i;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   op1_size = op1->_mp_size;
   op2_size = op2->_mp_size;
 
@@ -137,7 +137,7 @@ mpz_and (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
 	    }
 
 	  res->_mp_size = -res_size;
-	  TMP_FREE (marker);
+	  TMP_FREE;
 	  return;
 	}
       else
@@ -265,5 +265,5 @@ mpz_and (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
       }
 #endif
   }
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/aorsmul.c b/mpz/aorsmul.c
index c523dde76..d586e92df 100644
--- a/mpz/aorsmul.c
+++ b/mpz/aorsmul.c
@@ -45,7 +45,7 @@ mpz_aorsmul (mpz_ptr w, mpz_srcptr x, mpz_srcptr y, mp_size_t sub)
   mp_size_t  xsize, ysize, tsize, wsize, wsize_signed;
   mp_ptr     wp, tp;
   mp_limb_t  c, high;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   /* w unaffected if x==0 or y==0 */
   xsize = SIZ(x);
@@ -91,7 +91,7 @@ mpz_aorsmul (mpz_ptr w, mpz_srcptr x, mpz_srcptr y, mp_size_t sub)
       return;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
   tp = TMP_ALLOC_LIMBS (tsize);
 
   high = mpn_mul (tp, PTR(x),xsize, PTR(y),ysize);
@@ -139,7 +139,7 @@ mpz_aorsmul (mpz_ptr w, mpz_srcptr x, mpz_srcptr y, mp_size_t sub)
 
   SIZ(w) = (wsize_signed >= 0 ? wsize : -wsize);
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
 
 
diff --git a/mpz/aorsmul_i.c b/mpz/aorsmul_i.c
index 7ebd30b09..3a2d872c9 100644
--- a/mpz/aorsmul_i.c
+++ b/mpz/aorsmul_i.c
@@ -200,8 +200,8 @@ mpz_addmul_ui (mpz_ptr w, mpz_srcptr x, unsigned long y)
       mpz_t t;
       mp_ptr tp;
       mp_size_t xn;
-      TMP_DECL (mark);
-      TMP_MARK (mark);
+      TMP_DECL;
+      TMP_MARK;
       xn = SIZ (x);
       MPZ_TMP_INIT (t, ABS (xn) + 1);
       tp = PTR (t);
@@ -212,7 +212,7 @@ mpz_addmul_ui (mpz_ptr w, mpz_srcptr x, unsigned long y)
       PTR(t) = tp + 1;
       SIZ(t) = xn;
       mpz_aorsmul_1 (w, t, (mp_limb_t) y & GMP_NUMB_MASK, (mp_size_t) 0);
-      TMP_FREE (mark);
+      TMP_FREE;
       return;
     }
 #endif
@@ -228,8 +228,8 @@ mpz_submul_ui (mpz_ptr w, mpz_srcptr x, unsigned long y)
       mpz_t t;
       mp_ptr tp;
       mp_size_t xn;
-      TMP_DECL (mark);
-      TMP_MARK (mark);
+      TMP_DECL;
+      TMP_MARK;
       xn = SIZ (x);
       MPZ_TMP_INIT (t, ABS (xn) + 1);
       tp = PTR (t);
@@ -240,7 +240,7 @@ mpz_submul_ui (mpz_ptr w, mpz_srcptr x, unsigned long y)
       PTR(t) = tp + 1;
       SIZ(t) = xn;
       mpz_aorsmul_1 (w, t, (mp_limb_t) y & GMP_NUMB_MASK, (mp_size_t) -1);
-      TMP_FREE (mark);
+      TMP_FREE;
       return;
     }
 #endif
diff --git a/mpz/cdiv_q.c b/mpz/cdiv_q.c
index 3f71e56bb..b6c00719b 100644
--- a/mpz/cdiv_q.c
+++ b/mpz/cdiv_q.c
@@ -29,9 +29,9 @@ mpz_cdiv_q (mpz_ptr quot, mpz_srcptr dividend, mpz_srcptr divisor)
   mp_size_t dividend_size = dividend->_mp_size;
   mp_size_t divisor_size = divisor->_mp_size;
   mpz_t rem;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   MPZ_TMP_INIT (rem, ABS (divisor_size));
 
@@ -40,5 +40,5 @@ mpz_cdiv_q (mpz_ptr quot, mpz_srcptr dividend, mpz_srcptr divisor)
   if ((divisor_size ^ dividend_size) >= 0 && rem->_mp_size != 0)
     mpz_add_ui (quot, quot, 1L);
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/cdiv_qr.c b/mpz/cdiv_qr.c
index eacd75480..92a3df863 100644
--- a/mpz/cdiv_qr.c
+++ b/mpz/cdiv_qr.c
@@ -29,9 +29,9 @@ mpz_cdiv_qr (mpz_ptr quot, mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
   mp_size_t divisor_size = divisor->_mp_size;
   mp_size_t xsize;
   mpz_t temp_divisor;		/* N.B.: lives until function returns! */
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* We need the original value of the divisor after the quotient and
      remainder have been preliminary calculated.  We have to copy it to
@@ -52,5 +52,5 @@ mpz_cdiv_qr (mpz_ptr quot, mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
       mpz_sub (rem, rem, divisor);
     }
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/cdiv_r.c b/mpz/cdiv_r.c
index 37e974a5a..5524bddad 100644
--- a/mpz/cdiv_r.c
+++ b/mpz/cdiv_r.c
@@ -28,9 +28,9 @@ mpz_cdiv_r (mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
 {
   mp_size_t divisor_size = divisor->_mp_size;
   mpz_t temp_divisor;		/* N.B.: lives until function returns! */
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* We need the original value of the divisor after the remainder has been
      preliminary calculated.  We have to copy it to temporary space if it's
@@ -48,5 +48,5 @@ mpz_cdiv_r (mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
   if ((divisor_size ^ dividend->_mp_size) >= 0 && rem->_mp_size != 0)
     mpz_sub (rem, rem, divisor);
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/cdiv_r_ui.c b/mpz/cdiv_r_ui.c
index 70f338ff7..5b47952f7 100644
--- a/mpz/cdiv_r_ui.c
+++ b/mpz/cdiv_r_ui.c
@@ -50,7 +50,7 @@ mpz_cdiv_r_ui (mpz_ptr rem, mpz_srcptr dividend, unsigned long int divisor)
       mp_limb_t dp[2];
       mp_ptr rp, qp;
       mp_size_t rn;
-      TMP_DECL (mark);
+      TMP_DECL;
 
       MPZ_REALLOC (rem, 2);
       rp = PTR(rem);
@@ -62,12 +62,12 @@ mpz_cdiv_r_ui (mpz_ptr rem, mpz_srcptr dividend, unsigned long int divisor)
 	}
       else
 	{
-	  TMP_MARK (mark);
+	  TMP_MARK;
 	  dp[0] = divisor & GMP_NUMB_MASK;
 	  dp[1] = divisor >> GMP_NUMB_BITS;
 	  qp = TMP_ALLOC_LIMBS (nn - 2 + 1);
 	  mpn_tdiv_qr (qp, rp, (mp_size_t) 0, np, nn, dp, (mp_size_t) 2);
-	  TMP_FREE (mark);
+	  TMP_FREE;
 	  rl = rp[0] + (rp[1] << GMP_NUMB_BITS);
 	}
 
diff --git a/mpz/cdiv_ui.c b/mpz/cdiv_ui.c
index bd2666deb..f64918113 100644
--- a/mpz/cdiv_ui.c
+++ b/mpz/cdiv_ui.c
@@ -49,7 +49,7 @@ mpz_cdiv_ui (mpz_srcptr dividend, unsigned long int divisor)
       mp_limb_t dp[2], rp[2];
       mp_ptr qp;
       mp_size_t rn;
-      TMP_DECL (mark);
+      TMP_DECL;
 
       if (nn == 1)		/* tdiv_qr requirements; tested above for 0 */
 	{
@@ -58,12 +58,12 @@ mpz_cdiv_ui (mpz_srcptr dividend, unsigned long int divisor)
 	}
       else
 	{
-	  TMP_MARK (mark);
+	  TMP_MARK;
 	  dp[0] = divisor & GMP_NUMB_MASK;
 	  dp[1] = divisor >> GMP_NUMB_BITS;
 	  qp = TMP_ALLOC_LIMBS (nn - 2 + 1);
 	  mpn_tdiv_qr (qp, rp, (mp_size_t) 0, np, nn, dp, (mp_size_t) 2);
-	  TMP_FREE (mark);
+	  TMP_FREE;
 	  rl = rp[0] + (rp[1] << GMP_NUMB_BITS);
 	}
 
diff --git a/mpz/cong.c b/mpz/cong.c
index f01595adc..d32148e21 100644
--- a/mpz/cong.c
+++ b/mpz/cong.c
@@ -57,7 +57,7 @@ mpz_congruent_p (mpz_srcptr a, mpz_srcptr c, mpz_srcptr d)
   mp_ptr     xp;
   mp_limb_t  alow, clow, dlow, dmask, r;
   int        result;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   dsize = SIZ(d);
   if (UNLIKELY (dsize == 0))
@@ -145,7 +145,7 @@ mpz_congruent_p (mpz_srcptr a, mpz_srcptr c, mpz_srcptr d)
         }
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
   xp = TMP_ALLOC_LIMBS (asize+1);
 
   /* calculate abs(a-c) */
@@ -169,6 +169,6 @@ mpz_congruent_p (mpz_srcptr a, mpz_srcptr c, mpz_srcptr d)
 
   result = mpn_divisible_p (xp, asize, dp, dsize);
 
-  TMP_FREE (marker);
+  TMP_FREE;
   return result;
 }
diff --git a/mpz/divexact.c b/mpz/divexact.c
index 6c6cacbdb..e801fa42c 100644
--- a/mpz/divexact.c
+++ b/mpz/divexact.c
@@ -42,7 +42,7 @@ mpz_divexact (mpz_ptr quot, mpz_srcptr num, mpz_srcptr den)
   mp_size_t qsize, tsize;
   mp_srcptr np, dp;
   mp_size_t nsize, dsize;
-  TMP_DECL (marker);
+  TMP_DECL;
 
 #if WANT_ASSERT
   {
@@ -87,7 +87,7 @@ mpz_divexact (mpz_ptr quot, mpz_srcptr num, mpz_srcptr den)
       DIVIDE_BY_ZERO;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /*  QUOT <-- NUM/2^r, T <-- DEN/2^r where = r number of twos in DEN.  */
   while (dp[0] == 0)
@@ -124,5 +124,5 @@ mpz_divexact (mpz_ptr quot, mpz_srcptr num, mpz_srcptr den)
 
   quot->_mp_size = (num->_mp_size ^ den->_mp_size) >= 0 ? qsize : -qsize;
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/fdiv_q.c b/mpz/fdiv_q.c
index 73d2cee56..cb5887513 100644
--- a/mpz/fdiv_q.c
+++ b/mpz/fdiv_q.c
@@ -29,9 +29,9 @@ mpz_fdiv_q (mpz_ptr quot, mpz_srcptr dividend, mpz_srcptr divisor)
   mp_size_t dividend_size = dividend->_mp_size;
   mp_size_t divisor_size = divisor->_mp_size;
   mpz_t rem;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   MPZ_TMP_INIT (rem, ABS (divisor_size));
 
@@ -40,5 +40,5 @@ mpz_fdiv_q (mpz_ptr quot, mpz_srcptr dividend, mpz_srcptr divisor)
   if ((divisor_size ^ dividend_size) < 0 && rem->_mp_size != 0)
     mpz_sub_ui (quot, quot, 1L);
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/fdiv_qr.c b/mpz/fdiv_qr.c
index 6cbd65ee8..51e7803f5 100644
--- a/mpz/fdiv_qr.c
+++ b/mpz/fdiv_qr.c
@@ -29,9 +29,9 @@ mpz_fdiv_qr (mpz_ptr quot, mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
   mp_size_t divisor_size = divisor->_mp_size;
   mp_size_t xsize;
   mpz_t temp_divisor;		/* N.B.: lives until function returns! */
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* We need the original value of the divisor after the quotient and
      remainder have been preliminary calculated.  We have to copy it to
@@ -52,5 +52,5 @@ mpz_fdiv_qr (mpz_ptr quot, mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
       mpz_add (rem, rem, divisor);
     }
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/fdiv_r.c b/mpz/fdiv_r.c
index a1ecc786f..9056cb65a 100644
--- a/mpz/fdiv_r.c
+++ b/mpz/fdiv_r.c
@@ -28,9 +28,9 @@ mpz_fdiv_r (mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
 {
   mp_size_t divisor_size = divisor->_mp_size;
   mpz_t temp_divisor;		/* N.B.: lives until function returns! */
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* We need the original value of the divisor after the remainder has been
      preliminary calculated.  We have to copy it to temporary space if it's
@@ -47,5 +47,5 @@ mpz_fdiv_r (mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
   if ((divisor_size ^ dividend->_mp_size) < 0 && rem->_mp_size != 0)
     mpz_add (rem, rem, divisor);
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/fdiv_r_ui.c b/mpz/fdiv_r_ui.c
index 5b93437e2..1aebb26c3 100644
--- a/mpz/fdiv_r_ui.c
+++ b/mpz/fdiv_r_ui.c
@@ -48,7 +48,7 @@ mpz_fdiv_r_ui (mpz_ptr rem, mpz_srcptr dividend, unsigned long int divisor)
       mp_limb_t dp[2];
       mp_ptr rp, qp;
       mp_size_t rn;
-      TMP_DECL (mark);
+      TMP_DECL;
 
       MPZ_REALLOC (rem, 2);
       rp = PTR(rem);
@@ -60,12 +60,12 @@ mpz_fdiv_r_ui (mpz_ptr rem, mpz_srcptr dividend, unsigned long int divisor)
 	}
       else
 	{
-	  TMP_MARK (mark);
+	  TMP_MARK;
 	  dp[0] = divisor & GMP_NUMB_MASK;
 	  dp[1] = divisor >> GMP_NUMB_BITS;
 	  qp = TMP_ALLOC_LIMBS (nn - 2 + 1);
 	  mpn_tdiv_qr (qp, rp, (mp_size_t) 0, np, nn, dp, (mp_size_t) 2);
-	  TMP_FREE (mark);
+	  TMP_FREE;
 	  rl = rp[0] + (rp[1] << GMP_NUMB_BITS);
 	}
 
diff --git a/mpz/fdiv_ui.c b/mpz/fdiv_ui.c
index dee16a7b3..2bb707e12 100644
--- a/mpz/fdiv_ui.c
+++ b/mpz/fdiv_ui.c
@@ -47,7 +47,7 @@ mpz_fdiv_ui (mpz_srcptr dividend, unsigned long int divisor)
       mp_limb_t dp[2], rp[2];
       mp_ptr qp;
       mp_size_t rn;
-      TMP_DECL (mark);
+      TMP_DECL;
 
       if (nn == 1)		/* tdiv_qr requirements; tested above for 0 */
 	{
@@ -56,12 +56,12 @@ mpz_fdiv_ui (mpz_srcptr dividend, unsigned long int divisor)
 	}
       else
 	{
-	  TMP_MARK (mark);
+	  TMP_MARK;
 	  dp[0] = divisor & GMP_NUMB_MASK;
 	  dp[1] = divisor >> GMP_NUMB_BITS;
 	  qp = TMP_ALLOC_LIMBS (nn - 2 + 1);
 	  mpn_tdiv_qr (qp, rp, (mp_size_t) 0, np, nn, dp, (mp_size_t) 2);
-	  TMP_FREE (mark);
+	  TMP_FREE;
 	  rl = rp[0] + (rp[1] << GMP_NUMB_BITS);
 	}
 
diff --git a/mpz/fib_ui.c b/mpz/fib_ui.c
index c249a3989..2f18e1cc3 100644
--- a/mpz/fib_ui.c
+++ b/mpz/fib_ui.c
@@ -52,7 +52,7 @@ mpz_fib_ui (mpz_ptr fn, unsigned long n)
   mp_size_t      size, xalloc;
   unsigned long  n2;
   mp_limb_t      c, c2;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   if (n <= FIB_TABLE_LIMIT)
     {
@@ -66,7 +66,7 @@ mpz_fib_ui (mpz_ptr fn, unsigned long n)
   MPZ_REALLOC (fn, 2*xalloc+1);
   fp = PTR (fn);
 
-  TMP_MARK (marker);
+  TMP_MARK;
   TMP_ALLOC_LIMBS_2 (xp,xalloc, yp,xalloc);
   size = mpn_fib2_ui (xp, yp, n2);
 
@@ -140,5 +140,5 @@ mpz_fib_ui (mpz_ptr fn, unsigned long n)
   TRACE (printf ("done special, size=%ld\n", size);
          mpn_trace ("fp ", fp, size));
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/gcd.c b/mpz/gcd.c
index 0578c5174..e47b8d423 100644
--- a/mpz/gcd.c
+++ b/mpz/gcd.c
@@ -43,7 +43,7 @@ gcd (mpz_srcptr u, mpz_srcptr v, mpz_ptr g)
   mp_ptr vp = v->_mp_d;
   mp_size_t vsize = ABS (v->_mp_size);
   mp_size_t gsize;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   /* GCD(0, V) == V.  */
   if (usize == 0)
@@ -83,7 +83,7 @@ gcd (mpz_srcptr u, mpz_srcptr v, mpz_ptr g)
       return;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /*  Eliminate low zero bits from U and V and move to temporary storage.  */
   while (*up == 0)
@@ -161,5 +161,5 @@ gcd (mpz_srcptr u, mpz_srcptr v, mpz_ptr g)
     }
 
   g->_mp_size = gsize;
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/gcdext.c b/mpz/gcdext.c
index 71f6bfc4e..a6443fe1a 100644
--- a/mpz/gcdext.c
+++ b/mpz/gcdext.c
@@ -36,9 +36,9 @@ mpz_gcdext (mpz_ptr g, mpz_ptr s, mpz_ptr t, mpz_srcptr a, mpz_srcptr b)
   mpz_srcptr u, v;
   mpz_ptr ss, tt;
   __mpz_struct stmp, gtmp;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* mpn_gcdext requires that U >= V.  Therefore, we often have to swap U and
      V.  This in turn leads to a lot of complications.  The computed cofactor
@@ -124,5 +124,5 @@ mpz_gcdext (mpz_ptr g, mpz_ptr s, mpz_ptr t, mpz_srcptr a, mpz_srcptr b)
   MPN_COPY (gp, tmp_gp, gsize);
   SIZ (g) = gsize;
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/get_str.c b/mpz/get_str.c
index f700c0740..8e1b1acae 100644
--- a/mpz/get_str.c
+++ b/mpz/get_str.c
@@ -40,7 +40,7 @@ mpz_get_str (char *res_str, int base, mpz_srcptr x)
   size_t alloc_size = 0;
   char *num_to_text;
   int i;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   if (base >= 0)
     {
@@ -77,7 +77,7 @@ mpz_get_str (char *res_str, int base, mpz_srcptr x)
     }
 
   /* mpn_get_str clobbers its input on non power-of-2 bases */
-  TMP_MARK (marker);
+  TMP_MARK;
   xp = x->_mp_d;
   if (! POW2_P (base))
     {
@@ -103,7 +103,7 @@ mpz_get_str (char *res_str, int base, mpz_srcptr x)
     res_str[i] = num_to_text[str[i]];
   res_str[str_size] = 0;
 
-  TMP_FREE (marker);
+  TMP_FREE;
 
   /* if allocated then resize down to the actual space required */
   if (alloc_size != 0)
diff --git a/mpz/inp_raw.c b/mpz/inp_raw.c
index 4bb89b18b..2e795133c 100644
--- a/mpz/inp_raw.c
+++ b/mpz/inp_raw.c
@@ -122,9 +122,9 @@ mpz_inp_raw (mpz_ptr x, FILE *fp)
           int        bits;
           mp_size_t  tpos;
           mp_ptr     tp;
-          TMP_DECL (marker);
+          TMP_DECL;
 
-          TMP_MARK (marker);
+          TMP_MARK;
           tp = TMP_ALLOC_LIMBS (abs_xsize);
           limb = 0;
           bits = 0;
@@ -151,7 +151,7 @@ mpz_inp_raw (mpz_ptr x, FILE *fp)
           ASSERT (tpos == abs_xsize);
 
           MPN_COPY (xp, tp, abs_xsize);
-          TMP_FREE (marker);
+          TMP_FREE;
         }
 
       /* GMP 1.x mpz_out_raw wrote high zero bytes, strip any high zero
diff --git a/mpz/invert.c b/mpz/invert.c
index ee3e5a44e..2d0dcfa62 100644
--- a/mpz/invert.c
+++ b/mpz/invert.c
@@ -29,7 +29,7 @@ mpz_invert (mpz_ptr inverse, mpz_srcptr x, mpz_srcptr n)
 {
   mpz_t gcd, tmp;
   mp_size_t xsize, nsize, size;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   xsize = SIZ (x);
   nsize = SIZ (n);
@@ -42,7 +42,7 @@ mpz_invert (mpz_ptr inverse, mpz_srcptr x, mpz_srcptr n)
   if (xsize == 0 || (nsize == 1 && (PTR (n))[0] == 1))
     return 0;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   MPZ_TMP_INIT (gcd, size);
   MPZ_TMP_INIT (tmp, size);
@@ -51,7 +51,7 @@ mpz_invert (mpz_ptr inverse, mpz_srcptr x, mpz_srcptr n)
   /* If no inverse existed, return with an indication of that.  */
   if (SIZ (gcd) != 1 || PTR(gcd)[0] != 1)
     {
-      TMP_FREE (marker);
+      TMP_FREE;
       return 0;
     }
 
@@ -66,6 +66,6 @@ mpz_invert (mpz_ptr inverse, mpz_srcptr x, mpz_srcptr n)
   else
     mpz_set (inverse, tmp);
 
-  TMP_FREE (marker);
+  TMP_FREE;
   return 1;
 }
diff --git a/mpz/ior.c b/mpz/ior.c
index 11e2194c5..a694166a3 100644
--- a/mpz/ior.c
+++ b/mpz/ior.c
@@ -31,9 +31,9 @@ mpz_ior (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
   mp_ptr res_ptr;
   mp_size_t res_size;
   mp_size_t i;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   op1_size = op1->_mp_size;
   op2_size = op2->_mp_size;
 
@@ -150,7 +150,7 @@ mpz_ior (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
 	    }
 
 	  res->_mp_size = -res_size;
-	  TMP_FREE (marker);
+	  TMP_FREE;
 	  return;
 	}
       else
@@ -233,5 +233,5 @@ mpz_ior (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
 
     res->_mp_size = -res_size;
   }
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/jacobi.c b/mpz/jacobi.c
index e52b0d258..24741e681 100644
--- a/mpz/jacobi.c
+++ b/mpz/jacobi.c
@@ -89,7 +89,7 @@ mpz_jacobi (mpz_srcptr a, mpz_srcptr b)
   mp_limb_t  alow, blow, ahigh, bhigh, asecond, bsecond;
   unsigned   atwos, btwos;
   int        result_bit1;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   TRACE (printf ("start asize=%d bsize=%d\n", SIZ(a), SIZ(b));
          mpz_trace (" a", a);
@@ -190,7 +190,7 @@ mpz_jacobi (mpz_srcptr a, mpz_srcptr b)
     }
 
 
-  TMP_MARK (marker);
+  TMP_MARK;
   TMP_ALLOC_LIMBS_2 (ap, asize, bp, bsize);
 
   MPN_RSHIFT_OR_COPY (ap, asrcp, asize, atwos);
@@ -296,7 +296,7 @@ mpz_jacobi (mpz_srcptr a, mpz_srcptr b)
     }
 
   ASSERT (asize == 1 && bsize == 1);  /* just alow and blow left */
-  TMP_FREE (marker);
+  TMP_FREE;
 
   /* (1/b)=1 always (in this case have b==1 because a>=b) */
   if (alow == 1)
@@ -309,6 +309,6 @@ mpz_jacobi (mpz_srcptr a, mpz_srcptr b)
   return mpn_jacobi_base (blow, alow, result_bit1);
 
  zero:
-  TMP_FREE (marker);
+  TMP_FREE;
   return 0;
 }
diff --git a/mpz/lcm.c b/mpz/lcm.c
index 1aea24534..623ab2dac 100644
--- a/mpz/lcm.c
+++ b/mpz/lcm.c
@@ -29,7 +29,7 @@ mpz_lcm (mpz_ptr r, mpz_srcptr u, mpz_srcptr v)
 {
   mpz_t g;
   mp_size_t usize, vsize, size;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   usize = SIZ (u);
   vsize = SIZ (v);
@@ -70,7 +70,7 @@ mpz_lcm (mpz_ptr r, mpz_srcptr u, mpz_srcptr v)
       goto one;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
   size = MAX (usize, vsize);
   MPZ_TMP_INIT (g, size);
 
@@ -80,5 +80,5 @@ mpz_lcm (mpz_ptr r, mpz_srcptr u, mpz_srcptr v)
 
   SIZ (r) = ABS (SIZ (r));	/* result always positive */
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/lucnum2_ui.c b/mpz/lucnum2_ui.c
index aeeceea69..756265e60 100644
--- a/mpz/lucnum2_ui.c
+++ b/mpz/lucnum2_ui.c
@@ -30,7 +30,7 @@ mpz_lucnum2_ui (mpz_ptr ln, mpz_ptr lnsub1, unsigned long n)
   mp_ptr     lp, l1p, f1p;
   mp_size_t  size;
   mp_limb_t  c;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   ASSERT (ln != lnsub1);
 
@@ -51,7 +51,7 @@ mpz_lucnum2_ui (mpz_ptr ln, mpz_ptr lnsub1, unsigned long n)
       return;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
   size = MPN_FIB2_SIZE (n);
   f1p = TMP_ALLOC_LIMBS (size);
 
@@ -79,5 +79,5 @@ mpz_lucnum2_ui (mpz_ptr ln, mpz_ptr lnsub1, unsigned long n)
   l1p[size] = c;
   SIZ(lnsub1) = size + (c != 0);
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/lucnum_ui.c b/mpz/lucnum_ui.c
index 01e942f4a..59e5f4afd 100644
--- a/mpz/lucnum_ui.c
+++ b/mpz/lucnum_ui.c
@@ -52,7 +52,7 @@ mpz_lucnum_ui (mpz_ptr ln, unsigned long n)
   mp_ptr     lp, xp;
   mp_limb_t  c;
   int        zeros;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   TRACE (printf ("mpn_lucnum_ui n=%lu\n", n));
 
@@ -71,7 +71,7 @@ mpz_lucnum_ui (mpz_ptr ln, unsigned long n)
   MPZ_REALLOC (ln, lalloc);
   lp = PTR (ln);
 
-  TMP_MARK (marker);
+  TMP_MARK;
   xalloc = lalloc;
   xp = TMP_ALLOC_LIMBS (xalloc);
 
@@ -196,5 +196,5 @@ mpz_lucnum_ui (mpz_ptr ln, unsigned long n)
   ASSERT (lp == PTR(ln));
   SIZ(ln) = lsize;
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/millerrabin.c b/mpz/millerrabin.c
index 291c01ed4..3035043fb 100644
--- a/mpz/millerrabin.c
+++ b/mpz/millerrabin.c
@@ -44,8 +44,8 @@ mpz_millerrabin (mpz_srcptr n, int reps)
   unsigned long int k;
   gmp_randstate_t rstate;
   int is_prime;
-  TMP_DECL (marker);
-  TMP_MARK (marker);
+  TMP_DECL;
+  TMP_MARK;
 
   MPZ_TMP_INIT (nm1, SIZ (n) + 1);
   mpz_sub_ui (nm1, n, 1L);
@@ -58,7 +58,7 @@ mpz_millerrabin (mpz_srcptr n, int reps)
   mpz_powm (y, x, nm1, n);
   if (mpz_cmp_ui (y, 1L) != 0)
     {
-      TMP_FREE (marker);
+      TMP_FREE;
       return 0;
     }
 
@@ -87,7 +87,7 @@ mpz_millerrabin (mpz_srcptr n, int reps)
 
   gmp_randclear (rstate);
 
-  TMP_FREE (marker);
+  TMP_FREE;
   return is_prime;
 }
 
diff --git a/mpz/mod.c b/mpz/mod.c
index aa6e21604..c87885853 100644
--- a/mpz/mod.c
+++ b/mpz/mod.c
@@ -28,9 +28,9 @@ mpz_mod (mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
 {
   mp_size_t divisor_size = divisor->_mp_size;
   mpz_t temp_divisor;		/* N.B.: lives until function returns! */
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* We need the original value of the divisor after the remainder has been
      preliminary calculated.  We have to copy it to temporary space if it's
@@ -55,5 +55,5 @@ mpz_mod (mpz_ptr rem, mpz_srcptr dividend, mpz_srcptr divisor)
 	}
     }
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/mul.c b/mpz/mul.c
index 329babe8b..5e70143bf 100644
--- a/mpz/mul.c
+++ b/mpz/mul.c
@@ -43,7 +43,7 @@ mult (mpz_srcptr u, mpz_srcptr v, mpz_ptr w)
   mp_ptr free_me;
   size_t free_me_size;
   mp_limb_t cy_limb;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   sign_product = usize ^ vsize;
   usize = ABS (usize);
@@ -91,7 +91,7 @@ mult (mpz_srcptr u, mpz_srcptr v, mpz_ptr w)
     }
 #endif
 
-  TMP_MARK (marker);
+  TMP_MARK;
   free_me = NULL;
   up = u->_mp_d;
   vp = v->_mp_d;
@@ -142,5 +142,5 @@ mult (mpz_srcptr u, mpz_srcptr v, mpz_ptr w)
   w->_mp_size = sign_product < 0 ? -wsize : wsize;
   if (free_me != NULL)
     (*__gmp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/n_pow_ui.c b/mpz/n_pow_ui.c
index fc0d9c6fa..3b6b5b131 100644
--- a/mpz/n_pow_ui.c
+++ b/mpz/n_pow_ui.c
@@ -162,7 +162,7 @@ mpz_n_pow_ui (mpz_ptr r, mp_srcptr bp, mp_size_t bsize, unsigned long int e)
 #else
   mp_limb_t      b_twolimbs[2];
 #endif
-  TMP_DECL (marker);
+  TMP_DECL;
 
   TRACE (printf ("mpz_n_pow_ui rp=0x%lX bp=0x%lX bsize=%ld e=%lu (0x%lX)\n",
                  PTR(r), bp, bsize, e, e);
@@ -211,7 +211,7 @@ mpz_n_pow_ui (mpz_ptr r, mp_srcptr bp, mp_size_t bsize, unsigned long int e)
   TRACE (printf ("trailing zero btwos=%d rtwos_limbs=%ld rtwos_bits=%lu\n",
                  btwos, rtwos_limbs, rtwos_bits));
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   rl = 1;
 #if HAVE_NATIVE_mpn_mul_2
@@ -511,7 +511,7 @@ mpz_n_pow_ui (mpz_ptr r, mp_srcptr bp, mp_size_t bsize, unsigned long int e)
 
   ASSERT (rp == PTR(r) + rtwos_limbs);
   TRACE (mpn_trace ("end loop r", rp, rsize));
-  TMP_FREE (marker);
+  TMP_FREE;
 
   /* Apply any partial limb factors of 2. */
   if (rtwos_bits != 0)
diff --git a/mpz/out_str.c b/mpz/out_str.c
index 61dc0004b..3897edc6b 100644
--- a/mpz/out_str.c
+++ b/mpz/out_str.c
@@ -34,7 +34,7 @@ mpz_out_str (FILE *stream, int base, mpz_srcptr x)
   size_t i;
   size_t written;
   char *num_to_text;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   if (stream == 0)
     stream = stdout;
@@ -72,7 +72,7 @@ mpz_out_str (FILE *stream, int base, mpz_srcptr x)
       written = 1;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
   str_size = ((size_t) (x_size * BITS_PER_MP_LIMB
 			* __mp_bases[base].chars_per_bit_exactly)) + 3;
   str = (unsigned char *) TMP_ALLOC (str_size);
@@ -102,6 +102,6 @@ mpz_out_str (FILE *stream, int base, mpz_srcptr x)
     written += fwret;
   }
 
-  TMP_FREE (marker);
+  TMP_FREE;
   return ferror (stream) ? 0 : written;
 }
diff --git a/mpz/perfpow.c b/mpz/perfpow.c
index 0c940b5df..0f4a35b11 100644
--- a/mpz/perfpow.c
+++ b/mpz/perfpow.c
@@ -72,7 +72,7 @@ mpz_perfect_power_p (mpz_srcptr u)
   int exact;
   mp_size_t uns;
   mp_size_t usize = SIZ (u);
-  TMP_DECL (marker);
+  TMP_DECL;
 
   if (usize == 0)
     return 1;			/* consider 0 a perfect power */
@@ -84,7 +84,7 @@ mpz_perfect_power_p (mpz_srcptr u)
   if (n2 != 0 && (n2 & 1) == 0 && usize < 0)
     return 0;			/* 2 has even multiplicity with negative U */
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   uns = ABS (usize) - n2 / BITS_PER_MP_LIMB;
   MPZ_TMP_INIT (q, uns);
@@ -104,7 +104,7 @@ mpz_perfect_power_p (mpz_srcptr u)
 	  rem = mpz_tdiv_q_ui (q, u2, prime * prime);
 	  if (rem != 0)
 	    {
-	      TMP_FREE (marker);
+	      TMP_FREE;
 	      return 0;		/* prime divides exactly once, reject */
 	    }
 	  mpz_swap (q, u2);
@@ -119,20 +119,20 @@ mpz_perfect_power_p (mpz_srcptr u)
 
 	  if ((n & 1) == 0 && usize < 0)
 	    {
-	      TMP_FREE (marker);
+	      TMP_FREE;
 	      return 0;		/* even multiplicity with negative U, reject */
 	    }
 
 	  n2 = gcd (n2, n);
 	  if (n2 == 1)
 	    {
-	      TMP_FREE (marker);
+	      TMP_FREE;
 	      return 0;		/* we have multiplicity 1 of some factor */
 	    }
 
 	  if (mpz_cmpabs_ui (u2, 1) == 0)
 	    {
-	      TMP_FREE (marker);
+	      TMP_FREE;
 	      return 1;		/* factoring completed; consistent power */
 	    }
 
@@ -158,12 +158,12 @@ mpz_perfect_power_p (mpz_srcptr u)
 	    exact = mpz_root (q, u2, nth);
 	  if (exact)
 	    {
-	      TMP_FREE (marker);
+	      TMP_FREE;
 	      return 1;
 	    }
 	  if (mpz_cmp_ui (q, SMALLEST_OMITTED_PRIME) < 0)
 	    {
-	      TMP_FREE (marker);
+	      TMP_FREE;
 	      return 0;
 	    }
 	}
@@ -186,23 +186,23 @@ mpz_perfect_power_p (mpz_srcptr u)
 	    exact = mpz_root (q, u2, nth);
 	  if (exact)
 	    {
-	      TMP_FREE (marker);
+	      TMP_FREE;
 	      return 1;
 	    }
 	  if (mpz_cmp_ui (q, SMALLEST_OMITTED_PRIME) < 0)
 	    {
-	      TMP_FREE (marker);
+	      TMP_FREE;
 	      return 0;
 	    }
 	}
 
-      TMP_FREE (marker);
+      TMP_FREE;
       return 0;
     }
 
 n2prime:
   exact = mpz_root (NULL, u2, n2);
-  TMP_FREE (marker);
+  TMP_FREE;
   return exact;
 }
 
diff --git a/mpz/powm.c b/mpz/powm.c
index 36cbeda5c..1e27f7aac 100644
--- a/mpz/powm.c
+++ b/mpz/powm.c
@@ -60,14 +60,14 @@ static void
 reduce (mp_ptr tp, mp_srcptr ap, mp_size_t an, mp_srcptr mp, mp_size_t mn)
 {
   mp_ptr qp;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   qp = TMP_ALLOC_LIMBS (an - mn + 1);
 
   mpn_tdiv_qr (qp, tp, 0L, ap, an, mp, mn);
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
 
 #if REDUCE_EXPONENT
@@ -166,14 +166,14 @@ pow (mpz_srcptr b, mpz_srcptr e, mpz_srcptr m, mpz_ptr r)
 #if REDUCE_EXPONENT
   mpz_t new_e;
 #endif
-  TMP_DECL (marker);
+  TMP_DECL;
 
   mp = PTR(m);
   mn = ABSIZ (m);
   if (mn == 0)
     DIVIDE_BY_ZERO;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   es = SIZ (e);
   if (es <= 0)
@@ -184,7 +184,7 @@ pow (mpz_srcptr b, mpz_srcptr e, mpz_srcptr m, mpz_ptr r)
 	     m equals 1.  */
 	  SIZ(r) = (mn == 1 && mp[0] == 1) ? 0 : 1;
 	  PTR(r)[0] = 1;
-	  TMP_FREE (marker);	/* we haven't really allocated anything here */
+	  TMP_FREE;	/* we haven't really allocated anything here */
 	  return;
 	}
 #if HANDLE_NEGATIVE_EXPONENT
@@ -457,5 +457,5 @@ pow (mpz_srcptr b, mpz_srcptr e, mpz_srcptr m, mpz_ptr r)
   MPN_COPY (PTR(r), xp, xn);
 
   __GMP_FREE_FUNC_LIMBS (gp, K / 2 * mn);
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/powm_ui.c b/mpz/powm_ui.c
index 535fe1e55..97ab3955b 100644
--- a/mpz/powm_ui.c
+++ b/mpz/powm_ui.c
@@ -31,14 +31,14 @@ static void
 reduce (mp_ptr tp, mp_srcptr ap, mp_size_t an, mp_srcptr mp, mp_size_t mn)
 {
   mp_ptr qp;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   qp = TMP_ALLOC_LIMBS (an - mn + 1);
 
   mpn_tdiv_qr (qp, tp, 0L, ap, an, mp, mn);
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
 
 void
@@ -49,7 +49,7 @@ mpz_powm_ui (mpz_ptr r, mpz_srcptr b, unsigned long int el, mpz_srcptr m)
   int m_zero_cnt;
   int c;
   mp_limb_t e;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   mp = PTR(m);
   mn = ABSIZ(m);
@@ -65,7 +65,7 @@ mpz_powm_ui (mpz_ptr r, mpz_srcptr b, unsigned long int el, mpz_srcptr m)
       return;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* Normalize m (i.e. make its most significant bit set) as required by
      division functions below.  */
@@ -96,7 +96,7 @@ mpz_powm_ui (mpz_ptr r, mpz_srcptr b, unsigned long int el, mpz_srcptr m)
   if (bn == 0)
     {
       SIZ(r) = 0;
-      TMP_FREE (marker);
+      TMP_FREE;
       return;
     }
 
@@ -193,5 +193,5 @@ mpz_powm_ui (mpz_ptr r, mpz_srcptr b, unsigned long int el, mpz_srcptr m)
   SIZ (r) = xn;
   MPN_COPY (PTR(r), xp, xn);
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/set_str.c b/mpz/set_str.c
index b38469487..d9b756b93 100644
--- a/mpz/set_str.c
+++ b/mpz/set_str.c
@@ -42,7 +42,7 @@ mpz_set_str (mpz_ptr x, const char *str, int base)
   int c;
   int negative;
   const unsigned char *digit_value;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   digit_value = digit_value_tab;
   if (base > 36)
@@ -101,7 +101,7 @@ mpz_set_str (mpz_ptr x, const char *str, int base)
       return 0;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
   str_size = strlen (str - 1);
   s = begs = (char *) TMP_ALLOC (str_size + 1);
 
@@ -114,7 +114,7 @@ mpz_set_str (mpz_ptr x, const char *str, int base)
 	  int dig = digit_value[c];
 	  if (dig >= base)
 	    {
-	      TMP_FREE (marker);
+	      TMP_FREE;
 	      return -1;
 	    }
 	  *s++ = dig;
@@ -132,6 +132,6 @@ mpz_set_str (mpz_ptr x, const char *str, int base)
   xsize = mpn_set_str (x->_mp_d, (unsigned char *) begs, str_size, base);
   x->_mp_size = negative ? -xsize : xsize;
 
-  TMP_FREE (marker);
+  TMP_FREE;
   return 0;
 }
diff --git a/mpz/sqrt.c b/mpz/sqrt.c
index dfe0392ed..6e5253855 100644
--- a/mpz/sqrt.c
+++ b/mpz/sqrt.c
@@ -30,9 +30,9 @@ mpz_sqrt (mpz_ptr root, mpz_srcptr op)
   mp_ptr root_ptr, op_ptr;
   mp_ptr free_me = NULL;
   mp_size_t free_me_size;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   op_size = op->_mp_size;
   if (op_size <= 0)
     {
@@ -81,5 +81,5 @@ mpz_sqrt (mpz_ptr root, mpz_srcptr op)
 
   if (free_me != NULL)
     (*__gmp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/sqrtrem.c b/mpz/sqrtrem.c
index c933db570..dad1bc378 100644
--- a/mpz/sqrtrem.c
+++ b/mpz/sqrtrem.c
@@ -38,9 +38,9 @@ msqrt (mpz_srcptr op, mpz_ptr root, mpz_ptr rem)
   mp_ptr root_ptr, op_ptr;
   mp_ptr free_me = NULL;
   mp_size_t free_me_size;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   op_size = op->_mp_size;
   if (op_size <= 0)
     {
@@ -98,5 +98,5 @@ msqrt (mpz_srcptr op, mpz_ptr root, mpz_ptr rem)
 
   if (free_me != NULL)
     (*__gmp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/tdiv_q.c b/mpz/tdiv_q.c
index 1d97e0cd4..2bf5b940a 100644
--- a/mpz/tdiv_q.c
+++ b/mpz/tdiv_q.c
@@ -29,7 +29,7 @@ mpz_tdiv_q (mpz_ptr quot, mpz_srcptr num, mpz_srcptr den)
   mp_size_t ql;
   mp_size_t ns, ds, nl, dl;
   mp_ptr np, dp, qp, rp;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   ns = SIZ (num);
   ds = SIZ (den);
@@ -48,7 +48,7 @@ mpz_tdiv_q (mpz_ptr quot, mpz_srcptr num, mpz_srcptr den)
 
   MPZ_REALLOC (quot, ql);
 
-  TMP_MARK (marker);
+  TMP_MARK;
   qp = PTR (quot);
   rp = (mp_ptr) TMP_ALLOC (dl * BYTES_PER_MP_LIMB);
   np = PTR (num);
@@ -80,5 +80,5 @@ mpz_tdiv_q (mpz_ptr quot, mpz_srcptr num, mpz_srcptr den)
   ql -=  qp[ql - 1] == 0;
 
   SIZ (quot) = (ns ^ ds) >= 0 ? ql : -ql;
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/tdiv_qr.c b/mpz/tdiv_qr.c
index 5b1ea8127..f770fb6a7 100644
--- a/mpz/tdiv_qr.c
+++ b/mpz/tdiv_qr.c
@@ -37,7 +37,7 @@ mdiv (mpz_srcptr num, mpz_srcptr den, mpz_ptr quot, mpz_ptr rem)
   mp_size_t ql;
   mp_size_t ns, ds, nl, dl;
   mp_ptr np, dp, qp, rp;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   ns = SIZ (num);
   ds = SIZ (den);
@@ -68,7 +68,7 @@ mdiv (mpz_srcptr num, mpz_srcptr den, mpz_ptr quot, mpz_ptr rem)
 
   MPZ_REALLOC (quot, ql);
 
-  TMP_MARK (marker);
+  TMP_MARK;
   qp = PTR (quot);
   rp = PTR (rem);
   np = PTR (num);
@@ -104,5 +104,5 @@ mdiv (mpz_srcptr num, mpz_srcptr den, mpz_ptr quot, mpz_ptr rem)
 
   SIZ (quot) = (ns ^ ds) >= 0 ? ql : -ql;
   SIZ (rem) = ns >= 0 ? dl : -dl;
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/tdiv_r.c b/mpz/tdiv_r.c
index 6426c3457..35d9f0e82 100644
--- a/mpz/tdiv_r.c
+++ b/mpz/tdiv_r.c
@@ -29,7 +29,7 @@ mpz_tdiv_r (mpz_ptr rem, mpz_srcptr num, mpz_srcptr den)
   mp_size_t ql;
   mp_size_t ns, ds, nl, dl;
   mp_ptr np, dp, qp, rp;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   ns = SIZ (num);
   ds = SIZ (den);
@@ -55,7 +55,7 @@ mpz_tdiv_r (mpz_ptr rem, mpz_srcptr num, mpz_srcptr den)
       return;
     }
 
-  TMP_MARK (marker);
+  TMP_MARK;
   qp = (mp_ptr) TMP_ALLOC (ql * BYTES_PER_MP_LIMB);
   rp = PTR (rem);
   np = PTR (num);
@@ -87,5 +87,5 @@ mpz_tdiv_r (mpz_ptr rem, mpz_srcptr num, mpz_srcptr den)
   MPN_NORMALIZE (rp, dl);
 
   SIZ (rem) = ns >= 0 ? dl : -dl;
-  TMP_FREE (marker);
+  TMP_FREE;
 }
diff --git a/mpz/tdiv_r_ui.c b/mpz/tdiv_r_ui.c
index 3b196ba4f..75b0436a8 100644
--- a/mpz/tdiv_r_ui.c
+++ b/mpz/tdiv_r_ui.c
@@ -49,7 +49,7 @@ mpz_tdiv_r_ui (mpz_ptr rem, mpz_srcptr dividend, unsigned long int divisor)
       mp_limb_t dp[2];
       mp_ptr rp, qp;
       mp_size_t rn;
-      TMP_DECL (mark);
+      TMP_DECL;
 
       if (nn == 1)		/* tdiv_qr requirements; tested above for 0 */
 	{
@@ -62,12 +62,12 @@ mpz_tdiv_r_ui (mpz_ptr rem, mpz_srcptr dividend, unsigned long int divisor)
       MPZ_REALLOC (rem, 2);
       rp = PTR(rem);
 
-      TMP_MARK (mark);
+      TMP_MARK;
       dp[0] = divisor & GMP_NUMB_MASK;
       dp[1] = divisor >> GMP_NUMB_BITS;
       qp = TMP_ALLOC_LIMBS (nn - 2 + 1);
       mpn_tdiv_qr (qp, rp, (mp_size_t) 0, np, nn, dp, (mp_size_t) 2);
-      TMP_FREE (mark);
+      TMP_FREE;
       rl = rp[0] + (rp[1] << GMP_NUMB_BITS);
       rn = 2 - (rp[1] == 0);  rn -= (rp[rn - 1] == 0);
       SIZ(rem) = ns >= 0 ? rn : -rn;
diff --git a/mpz/tdiv_ui.c b/mpz/tdiv_ui.c
index 7a3c9f8fd..825eb941e 100644
--- a/mpz/tdiv_ui.c
+++ b/mpz/tdiv_ui.c
@@ -49,7 +49,7 @@ mpz_tdiv_ui (mpz_srcptr dividend, unsigned long int divisor)
       mp_limb_t dp[2], rp[2];
       mp_ptr qp;
       mp_size_t rn;
-      TMP_DECL (mark);
+      TMP_DECL;
 
       if (nn == 1)		/* tdiv_qr requirements; tested above for 0 */
 	{
@@ -57,12 +57,12 @@ mpz_tdiv_ui (mpz_srcptr dividend, unsigned long int divisor)
 	  return rl;
 	}
 
-      TMP_MARK (mark);
+      TMP_MARK;
       dp[0] = divisor & GMP_NUMB_MASK;
       dp[1] = divisor >> GMP_NUMB_BITS;
       qp = TMP_ALLOC_LIMBS (nn - 2 + 1);
       mpn_tdiv_qr (qp, rp, (mp_size_t) 0, np, nn, dp, (mp_size_t) 2);
-      TMP_FREE (mark);
+      TMP_FREE;
       rl = rp[0] + (rp[1] << GMP_NUMB_BITS);
       rn = 2 - (rp[1] == 0);  rn -= (rp[rn - 1] == 0);
     }
diff --git a/mpz/xor.c b/mpz/xor.c
index 394075cb3..bcb3d4fef 100644
--- a/mpz/xor.c
+++ b/mpz/xor.c
@@ -31,9 +31,9 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
   mp_ptr res_ptr;
   mp_size_t res_size, res_alloc;
   mp_size_t i;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   op1_size = op1->_mp_size;
   op2_size = op2->_mp_size;
 
@@ -142,7 +142,7 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
 
 	  MPN_NORMALIZE (res_ptr, res_size);
 	  res->_mp_size = res_size;
-	  TMP_FREE (marker);
+	  TMP_FREE;
 	  return;
 	}
       else
@@ -203,6 +203,6 @@ mpz_xor (mpz_ptr res, mpz_srcptr op1, mpz_srcptr op2)
 
     MPN_NORMALIZE (res_ptr, res_size);
     res->_mp_size = -res_size;
-    TMP_FREE (marker);
+    TMP_FREE;
   }
 }
diff --git a/randlc2x.c b/randlc2x.c
index bcef35945..f2f3028a1 100644
--- a/randlc2x.c
+++ b/randlc2x.c
@@ -71,7 +71,7 @@ lc (mp_ptr rp, gmp_randstate_t rstate)
   int cy;
   mp_size_t xn;
   gmp_rand_lc_struct *p;
-  TMP_DECL (mark);
+  TMP_DECL;
 
   p = (gmp_rand_lc_struct *) RNG_STATE (rstate);
 
@@ -86,7 +86,7 @@ lc (mp_ptr rp, gmp_randstate_t rstate)
   /* Allocate temporary storage.  Let there be room for calculation of
      (A * seed + C) % M, or M if bigger than that.  */
 
-  TMP_MARK (mark);
+  TMP_MARK;
 
   ta = an + seedn + 1;
   tn = BITS_TO_LIMBS (m2exp);
@@ -132,7 +132,7 @@ lc (mp_ptr rp, gmp_randstate_t rstate)
 	MPN_COPY_INCR (rp, tp + xn, tn);
     }
 
-  TMP_FREE (mark);
+  TMP_FREE;
 
   /* Return number of valid bits in the result.  */
   return (m2exp + 1) / 2;
@@ -148,11 +148,11 @@ randget_lc (gmp_randstate_t rstate, mp_ptr rp, unsigned long int nbits)
   mp_ptr tp;
   mp_size_t tn;
   gmp_rand_lc_struct *p;
-  TMP_DECL (lcmark);
+  TMP_DECL;
 
   p = (gmp_rand_lc_struct *) RNG_STATE (rstate);
 
-  TMP_MARK (lcmark);
+  TMP_MARK;
 
   chunk_nbits = p->_mp_m2exp / 2;
   tn = BITS_TO_LIMBS (chunk_nbits);
@@ -215,7 +215,7 @@ randget_lc (gmp_randstate_t rstate, mp_ptr rp, unsigned long int nbits)
 	  &= ~(~CNST_LIMB (0) << nbits % GMP_NUMB_BITS);
     }
 
-  TMP_FREE (lcmark);
+  TMP_FREE;
 }
 
 
diff --git a/tests/devel/try.c b/tests/devel/try.c
index e458fd369..902097ba1 100644
--- a/tests/devel/try.c
+++ b/tests/devel/try.c
@@ -1240,8 +1240,8 @@ void
 mpn_kara_mul_n_fun (mp_ptr dst, mp_srcptr src1, mp_srcptr src2, mp_size_t size)
 {
   mp_ptr  tspace;
-  TMP_DECL (marker);
-  TMP_MARK (marker);
+  TMP_DECL;
+  TMP_MARK;
   tspace = TMP_ALLOC_LIMBS (MPN_KARA_MUL_N_TSIZE (size));
   mpn_kara_mul_n (dst, src1, src2, size, tspace);
 }
@@ -1249,18 +1249,18 @@ void
 mpn_kara_sqr_n_fun (mp_ptr dst, mp_srcptr src, mp_size_t size)
 {
   mp_ptr tspace;
-  TMP_DECL (marker);
-  TMP_MARK (marker);
+  TMP_DECL;
+  TMP_MARK;
   tspace = TMP_ALLOC_LIMBS (MPN_KARA_SQR_N_TSIZE (size));
   mpn_kara_sqr_n (dst, src, size, tspace);
-  TMP_FREE (marker);
+  TMP_FREE;
 }
 void
 mpn_toom3_mul_n_fun (mp_ptr dst, mp_srcptr src1, mp_srcptr src2, mp_size_t size)
 {
   mp_ptr  tspace;
-  TMP_DECL (marker);
-  TMP_MARK (marker);
+  TMP_DECL;
+  TMP_MARK;
   tspace = TMP_ALLOC_LIMBS (MPN_TOOM3_MUL_N_TSIZE (size));
   mpn_toom3_mul_n (dst, src1, src2, size, tspace);
 }
@@ -1268,11 +1268,11 @@ void
 mpn_toom3_sqr_n_fun (mp_ptr dst, mp_srcptr src, mp_size_t size)
 {
   mp_ptr tspace;
-  TMP_DECL (marker);
-  TMP_MARK (marker);
+  TMP_DECL;
+  TMP_MARK;
   tspace = TMP_ALLOC_LIMBS (MPN_TOOM3_SQR_N_TSIZE (size));
   mpn_toom3_sqr_n (dst, src, size, tspace);
-  TMP_FREE (marker);
+  TMP_FREE;
 }
 mp_limb_t
 umul_ppmm_fun (mp_limb_t *lowptr, mp_limb_t m1, mp_limb_t m2)
diff --git a/tests/refmpf.c b/tests/refmpf.c
index 1757c703b..83bb7789a 100644
--- a/tests/refmpf.c
+++ b/tests/refmpf.c
@@ -35,9 +35,9 @@ refmpf_add (mpf_ptr w, mpf_srcptr u, mpf_srcptr v)
   int neg;
   mp_exp_t exp;
   mp_limb_t cy;
-  TMP_DECL (mark);
+  TMP_DECL;
 
-  TMP_MARK (mark);
+  TMP_MARK;
 
   if (SIZ (u) == 0)
     {
@@ -98,7 +98,7 @@ done:
   MPN_COPY (PTR (w), wt, size);
   SIZ (w) = neg == 0 ? size : -size;
   EXP (w) = exp;
-  TMP_FREE (mark);
+  TMP_FREE;
 }
 
 
@@ -206,9 +206,9 @@ refmpf_sub (mpf_ptr w, mpf_srcptr u, mpf_srcptr v)
   mp_ptr ut, vt, wt;
   int neg;
   mp_exp_t exp;
-  TMP_DECL (mark);
+  TMP_DECL;
 
-  TMP_MARK (mark);
+  TMP_MARK;
 
   if (SIZ (u) == 0)
     {
@@ -280,7 +280,7 @@ done:
   MPN_COPY (PTR (w), wt, size);
   SIZ (w) = neg == 0 ? size : -size;
   EXP (w) = exp;
-  TMP_FREE (mark);
+  TMP_FREE;
 }
 
 
diff --git a/tests/trace.c b/tests/trace.c
index a68623d73..2d393a74a 100644
--- a/tests/trace.c
+++ b/tests/trace.c
@@ -248,9 +248,9 @@ mpn_tracea_file (const char *filename,
 {
   char  *s;
   int   i;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   s = (char *) TMP_ALLOC (strlen (filename) + 50);
 
   for (i = 0; i < count; i++)
@@ -259,7 +259,7 @@ mpn_tracea_file (const char *filename,
       mpn_trace_file (s, a[i], size);
     }
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
 
 
diff --git a/tune/common.c b/tune/common.c
index 798a07a7c..3b98e1d77 100644
--- a/tune/common.c
+++ b/tune/common.c
@@ -922,7 +922,7 @@ speed_mpn_mul_fft_full_sqr (struct speed_params *s)
     int        k;                                       \
     unsigned   i;                                       \
     double     t;                                       \
-    TMP_DECL (marker);                                  \
+    TMP_DECL;                                  \
                                                         \
     SPEED_RESTRICT_COND (s->size >= 1);                 \
                                                         \
@@ -931,7 +931,7 @@ speed_mpn_mul_fft_full_sqr (struct speed_params *s)
     else                                                \
       k = mpn_fft_best_k (s->size, sqr);                \
                                                         \
-    TMP_MARK (marker);                                  \
+    TMP_MARK;                                  \
     pl = mpn_fft_next_size (s->size, k);                \
     SPEED_TMP_ALLOC_LIMBS (wp, pl+1, s->align_wp);      \
                                                         \
@@ -948,7 +948,7 @@ speed_mpn_mul_fft_full_sqr (struct speed_params *s)
     while (--i != 0);                                   \
     t = speed_endtime ();                               \
                                                         \
-    TMP_FREE (marker);                                  \
+    TMP_FREE;                                  \
     return t;                                           \
   }
 
@@ -993,12 +993,12 @@ speed_mpn_hgcd (struct speed_params *s)
   int res;
   unsigned i;
   double t;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   if (s->size < 2)
     return -1;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   SPEED_TMP_ALLOC_LIMBS (ap, s->size + 1, s->align_xp);
   SPEED_TMP_ALLOC_LIMBS (bp, s->size + 1, s->align_yp);
@@ -1033,7 +1033,7 @@ speed_mpn_hgcd (struct speed_params *s)
   if (res)
     ASSERT_HGCD (&hgcd, ap, s->size, bp, s->size, 0, 4);
 #endif
-  TMP_FREE (marker);
+  TMP_FREE;
   return t;
 }
 #if 0
@@ -1053,12 +1053,12 @@ speed_mpn_hgcd_lehmer (struct speed_params *s)
   int res;
   unsigned i;
   double t;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   if (s->size < 2)
     return -1;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   SPEED_TMP_ALLOC_LIMBS (ap, s->size + 1, s->align_xp);
   SPEED_TMP_ALLOC_LIMBS (bp, s->size + 1, s->align_yp);
@@ -1093,7 +1093,7 @@ speed_mpn_hgcd_lehmer (struct speed_params *s)
   if (res)
     ASSERT_HGCD (&hgcd, ap, s->size, bp, s->size, 0, 4);
 #endif
-  TMP_FREE (marker);
+  TMP_FREE;
   return t;
 }
 #endif
@@ -1288,9 +1288,9 @@ speed_noop_wxs (struct speed_params *s)
   mp_ptr   wp;
   unsigned i;
   double   t;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   wp = TMP_ALLOC_LIMBS (1);
 
   speed_starttime ();
@@ -1300,7 +1300,7 @@ speed_noop_wxs (struct speed_params *s)
   while (--i != 0);
   t = speed_endtime ();
 
-  TMP_FREE (marker);
+  TMP_FREE;
   return t;
 }
 
@@ -1310,9 +1310,9 @@ speed_noop_wxys (struct speed_params *s)
   mp_ptr   wp;
   unsigned i;
   double   t;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   wp = TMP_ALLOC_LIMBS (1);
 
   speed_starttime ();
@@ -1322,7 +1322,7 @@ speed_noop_wxys (struct speed_params *s)
   while (--i != 0);
   t = speed_endtime ();
 
-  TMP_FREE (marker);
+  TMP_FREE;
   return t;
 }
 
diff --git a/tune/speed-ext.c b/tune/speed-ext.c
index 53e4fa14e..1f8f050e5 100644
--- a/tune/speed-ext.c
+++ b/tune/speed-ext.c
@@ -182,11 +182,11 @@ mean_open2 (mp_ptr wp, mp_srcptr xp, mp_srcptr yp, mp_size_t size)
     unsigned  i;                                        \
     mp_ptr    wp;                                       \
     double    t;                                        \
-    TMP_DECL (marker);                                  \
+    TMP_DECL;                                  \
                                                         \
     SPEED_RESTRICT_COND (s->size >= 1);                 \
                                                         \
-    TMP_MARK (marker);                                  \
+    TMP_MARK;                                  \
     SPEED_TMP_ALLOC_LIMBS (wp, s->size, s->align_wp);   \
                                                         \
     speed_operand_src (s, s->xp, s->size);              \
@@ -201,7 +201,7 @@ mean_open2 (mp_ptr wp, mp_srcptr xp, mp_srcptr yp, mp_size_t size)
     while (--i != 0);                                   \
     t = speed_endtime ();                               \
                                                         \
-    TMP_FREE (marker);                                  \
+    TMP_FREE;                                  \
     return t;                                           \
   }
 
diff --git a/tune/speed.c b/tune/speed.c
index 4a141dae6..036ab387b 100644
--- a/tune/speed.c
+++ b/tune/speed.c
@@ -459,9 +459,9 @@ run_one (FILE *fp, struct speed_params *s, mp_size_t prev_size)
   const char  *first_open_fastest, *first_open_notfastest, *first_close;
   int         i, fastest, want_data;
   double      fastest_time;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
 
   /* allocate data, unless all routines are NODATA */
   want_data = 0;
@@ -625,7 +625,7 @@ run_one (FILE *fp, struct speed_params *s, mp_size_t prev_size)
       fprintf (fp, "\n");
     }
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
 
 void
@@ -633,9 +633,9 @@ run_all (FILE *fp)
 {
   mp_size_t  prev_size;
   int        i;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   SPEED_TMP_ALLOC_LIMBS (sp.xp_block, SPEED_BLOCK_SIZE, sp.align_xp);
   SPEED_TMP_ALLOC_LIMBS (sp.yp_block, SPEED_BLOCK_SIZE, sp.align_yp);
 
@@ -676,7 +676,7 @@ run_all (FILE *fp)
         }
     }
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }
 
 
diff --git a/tune/tuneup.c b/tune/tuneup.c
index 8b0cfa1c7..03229751b 100644
--- a/tune/tuneup.c
+++ b/tune/tuneup.c
@@ -350,14 +350,14 @@ tuneup_measure (speed_function_t fun,
 {
   static struct param_t  dummy;
   double   t;
-  TMP_DECL (marker);
+  TMP_DECL;
 
   if (! param)
     param = &dummy;
 
   s->size += param->size_extra;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   SPEED_TMP_ALLOC_LIMBS (s->xp, s->size, 0);
   SPEED_TMP_ALLOC_LIMBS (s->yp, s->size, 0);
 
@@ -379,7 +379,7 @@ tuneup_measure (speed_function_t fun,
 
   s->size -= param->size_extra;
 
-  TMP_FREE (marker);
+  TMP_FREE;
   return t;
 }
 
@@ -1628,9 +1628,9 @@ void
 all (void)
 {
   time_t  start_time, end_time;
-  TMP_DECL (marker);
+  TMP_DECL;
 
-  TMP_MARK (marker);
+  TMP_MARK;
   SPEED_TMP_ALLOC_LIMBS (s.xp_block, SPEED_BLOCK_SIZE, 0);
   SPEED_TMP_ALLOC_LIMBS (s.yp_block, SPEED_BLOCK_SIZE, 0);
 
@@ -1734,7 +1734,7 @@ all (void)
   printf ("/* Tuneup completed successfully, took %ld seconds */\n",
           end_time - start_time);
 
-  TMP_FREE (marker);
+  TMP_FREE;
 }