From 0fd0464161188ccc195dadafdf6edbb288cd6934 Mon Sep 17 00:00:00 2001
From: William Hart <goodwillhart@googlemail.com>
Date: Tue, 10 Nov 2015 13:44:55 +0000
Subject: [PATCH] Inline long -> slong return values.

---
 fmpr.h        | 16 ++++++++--------
 fmprb.h       |  8 ++++----
 fmpz_extras.h |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/fmpr.h b/fmpr.h
index 34336997..bf0ab526 100644
--- a/fmpr.h
+++ b/fmpr.h
@@ -217,7 +217,7 @@ fmpr_swap(fmpr_t x, fmpr_t y)
 slong _fmpr_set_round(fmpz_t rman, fmpz_t rexp,
     const fmpz_t man, const fmpz_t exp, slong prec, fmpr_rnd_t rnd);
 
-static __inline__ long
+static __inline__ slong
 _fmpr_normalise(fmpz_t man, fmpz_t exp, slong prec, fmpr_rnd_t rnd)
 {
     if (fmpz_is_zero(man))
@@ -232,7 +232,7 @@ _fmpr_normalise(fmpz_t man, fmpz_t exp, slong prec, fmpr_rnd_t rnd)
     }
 }
 
-static __inline__ long
+static __inline__ slong
 fmpr_set_round_naive(fmpr_t y, const fmpr_t x, slong prec, fmpr_rnd_t rnd)
 {
     fmpr_set(y, x);
@@ -242,7 +242,7 @@ fmpr_set_round_naive(fmpr_t y, const fmpr_t x, slong prec, fmpr_rnd_t rnd)
         return _fmpr_normalise(fmpr_manref(y), fmpr_expref(y), prec, rnd);
 }
 
-static __inline__ long
+static __inline__ slong
 fmpr_set_round(fmpr_t y, const fmpr_t x, slong prec, fmpr_rnd_t rnd)
 {
     if (fmpr_is_special(x))
@@ -257,7 +257,7 @@ fmpr_set_round(fmpr_t y, const fmpr_t x, slong prec, fmpr_rnd_t rnd)
     }
 }
 
-static __inline__ long
+static __inline__ slong
 fmpr_set_round_fmpz_2exp(fmpr_t y, const fmpz_t x, const fmpz_t exp, slong prec, fmpr_rnd_t rnd)
 {
     if (fmpz_is_zero(x))
@@ -271,7 +271,7 @@ fmpr_set_round_fmpz_2exp(fmpr_t y, const fmpz_t x, const fmpz_t exp, slong prec,
     }
 }
 
-static __inline__ long
+static __inline__ slong
 fmpr_set_round_fmpz(fmpr_t y, const fmpz_t x, slong prec, fmpr_rnd_t rnd)
 {
     if (fmpz_is_zero(x))
@@ -404,7 +404,7 @@ slong _fmpr_add_mpn(fmpr_t z,
         mp_srcptr yman, mp_size_t yn, int ysign, const fmpz_t yexp,
         slong shift, slong prec, fmpr_rnd_t rnd);
 
-static __inline__ long
+static __inline__ slong
 _fmpr_add_1x1(fmpr_t z,
         mp_limb_t x, int xsign, const fmpz_t xexp,
         mp_limb_t y, int ysign, const fmpz_t yexp,
@@ -534,7 +534,7 @@ fmpr_neg(fmpr_t y, const fmpr_t x)
     }
 }
 
-static __inline__ long
+static __inline__ slong
 fmpr_neg_round(fmpr_t y, const fmpr_t x, slong prec, fmpr_rnd_t rnd)
 {
     fmpr_neg(y, x);
@@ -696,7 +696,7 @@ fmpr_max(fmpr_t z, const fmpr_t a, const fmpr_t b)
         fmpr_set(z, b);
 }
 
-static __inline__ long
+static __inline__ slong
 fmpr_bits(const fmpr_t x)
 {
     if (fmpr_is_special(x))
diff --git a/fmprb.h b/fmprb.h
index 86474705..9716a15f 100644
--- a/fmprb.h
+++ b/fmprb.h
@@ -491,7 +491,7 @@ void fmprb_set_interval_fmpr(fmprb_t x, const fmpr_t a, const fmpr_t b, slong pr
 
 void fmprb_union(fmprb_t z, const fmprb_t x, const fmprb_t y, slong prec);
 
-static __inline__ long
+static __inline__ slong
 fmprb_rel_error_bits(const fmprb_t x)
 {
     fmpz_t midmag, radmag;
@@ -517,13 +517,13 @@ fmprb_rel_error_bits(const fmprb_t x)
     return result;
 }
 
-static __inline__ long
+static __inline__ slong
 fmprb_rel_accuracy_bits(const fmprb_t x)
 {
     return -fmprb_rel_error_bits(x);
 }
 
-static __inline__ long
+static __inline__ slong
 fmprb_bits(const fmprb_t x)
 {
     return fmpr_bits(fmprb_midref(x));
@@ -708,7 +708,7 @@ _fmprb_vec_get_abs_ubound_fmpr(fmpr_t bound, fmprb_srcptr vec,
     }
 }
 
-static __inline__ long
+static __inline__ slong
 _fmprb_vec_bits(fmprb_srcptr x, slong len)
 {
     slong i, b, c;
diff --git a/fmpz_extras.h b/fmpz_extras.h
index 710a34b4..8fce4e1c 100644
--- a/fmpz_extras.h
+++ b/fmpz_extras.h
@@ -202,7 +202,7 @@ static __inline__ void fmpz_sub_mul2exp(fmpz_t z, const fmpz_t x, const fmpz_t y
 
 slong _fmpz_sub_small_large(const fmpz_t x, const fmpz_t y);
 
-static __inline__ long
+static __inline__ slong
 _fmpz_sub_small(const fmpz_t x, const fmpz_t y)
 {
     if (!COEFF_IS_MPZ(*x) && !COEFF_IS_MPZ(*y))