summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorvlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4>2014-07-02 11:41:43 +0000
committervlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4>2014-07-02 11:41:43 +0000
commiteb398645f08db86a45fad4304894e01469543aaa (patch)
tree1e6cde3039e99b1ddb839eee714e38e603b15031 /src
parent4ee70bd35959ae283a2e4db373f87f3244a20531 (diff)
downloadmpfr-eb398645f08db86a45fad4304894e01469543aaa.tar.gz
Renamed WANT_MINI_GMP to MPFR_USE_MINI_GMP as it is used in mpfr.h
(all MPFR macros that appear there should start with MPFR_ to avoid conflicts with other software). git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/trunk@9129 280ebfd0-de03-0410-8827-d642c229c3f4
Diffstat (limited to 'src')
-rw-r--r--src/erandom.c2
-rw-r--r--src/get_f.c2
-rw-r--r--src/gmp_op.c4
-rw-r--r--src/mpfr-impl.h2
-rw-r--r--src/mpfr-mini-gmp.c6
-rw-r--r--src/mpfr.h4
-rw-r--r--src/nrandom.c2
-rw-r--r--src/printf.c2
-rw-r--r--src/random_deviate.c2
-rw-r--r--src/set_f.c2
-rw-r--r--src/set_q.c2
-rw-r--r--src/vasprintf.c2
12 files changed, 16 insertions, 16 deletions
diff --git a/src/erandom.c b/src/erandom.c
index 26ec88140..202904484 100644
--- a/src/erandom.c
+++ b/src/erandom.c
@@ -54,7 +54,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
/* this file cannot be compiled with mini-gmp since it relies on
mpfr_random_deviate_value which needs mpq_t */
-#ifndef WANT_MINI_GMP
+#ifndef MPFR_USE_MINI_GMP
#include "random_deviate.h"
/* true with prob exp(-x) */
diff --git a/src/get_f.c b/src/get_f.c
index d5565d3ab..79929f63e 100644
--- a/src/get_f.c
+++ b/src/get_f.c
@@ -22,7 +22,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
#include "mpfr-impl.h"
-#ifndef WANT_MINI_GMP
+#ifndef MPFR_USE_MINI_GMP
/* Since MPFR-3.0, return the usual inexact value.
The erange flag is set if an error occurred in the conversion
(y is NaN, +Inf, or -Inf that have no equivalent in mpf)
diff --git a/src/gmp_op.c b/src/gmp_op.c
index 407e630c6..49d57dfcf 100644
--- a/src/gmp_op.c
+++ b/src/gmp_op.c
@@ -244,7 +244,7 @@ mpfr_muldiv_z (mpfr_ptr y, mpfr_srcptr x, mpz_srcptr n, mpz_srcptr d,
}
}
-#ifndef WANT_MINI_GMP
+#ifndef MPFR_USE_MINI_GMP
int
mpfr_mul_q (mpfr_ptr y, mpfr_srcptr x, mpq_srcptr z, mpfr_rnd_t rnd_mode)
{
@@ -479,7 +479,7 @@ mpfr_cmp_q (mpfr_srcptr x, mpq_srcptr q)
}
#endif
-#ifndef WANT_MINI_GMP
+#ifndef MPFR_USE_MINI_GMP
int
mpfr_cmp_f (mpfr_srcptr x, mpf_srcptr z)
{
diff --git a/src/mpfr-impl.h b/src/mpfr-impl.h
index 66150d48e..a56754b99 100644
--- a/src/mpfr-impl.h
+++ b/src/mpfr-impl.h
@@ -92,7 +92,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
# include "gmp.h"
# endif
/* if using mini-gmp, include missing definitions in mini-gmp */
-# ifdef WANT_MINI_GMP
+# ifdef MPFR_USE_MINI_GMP
# include "mpfr-mini-gmp.h"
# endif
# ifndef __MPFR_H
diff --git a/src/mpfr-mini-gmp.c b/src/mpfr-mini-gmp.c
index 56f31e28e..5a5dc9957 100644
--- a/src/mpfr-mini-gmp.c
+++ b/src/mpfr-mini-gmp.c
@@ -21,11 +21,11 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
/* The following include will do 2 things: include the config.h
- if there is one (as it may define WANT_MINI_GMP), and avoid
+ if there is one (as it may define MPFR_USE_MINI_GMP), and avoid
an empty translation unit (see ISO C99, 6.9). */
#include "mpfr-impl.h"
-#ifdef WANT_MINI_GMP
+#ifdef MPFR_USE_MINI_GMP
#include "mpfr-mini-gmp.h"
@@ -348,4 +348,4 @@ mpz_dump (mpz_t z)
}
#endif
-#endif /* WANT_MINI_GMP */
+#endif /* MPFR_USE_MINI_GMP */
diff --git a/src/mpfr.h b/src/mpfr.h
index 9c70af6b6..3909d25c0 100644
--- a/src/mpfr.h
+++ b/src/mpfr.h
@@ -430,7 +430,7 @@ __MPFR_DECLSPEC void mpfr_set_nan _MPFR_PROTO ((mpfr_ptr));
__MPFR_DECLSPEC void mpfr_set_inf _MPFR_PROTO ((mpfr_ptr, int));
__MPFR_DECLSPEC void mpfr_set_zero _MPFR_PROTO ((mpfr_ptr, int));
-#ifndef WANT_MINI_GMP
+#ifndef MPFR_USE_MINI_GMP
/* mini-gmp does not provide mpf_t, we disable the following functions */
__MPFR_DECLSPEC int
mpfr_set_f _MPFR_PROTO ((mpfr_ptr, mpf_srcptr, mpfr_rnd_t));
@@ -445,7 +445,7 @@ __MPFR_DECLSPEC int
mpfr_set_si_2exp _MPFR_PROTO ((mpfr_ptr, long, mpfr_exp_t, mpfr_rnd_t));
__MPFR_DECLSPEC int
mpfr_set_ui_2exp _MPFR_PROTO ((mpfr_ptr,unsigned long,mpfr_exp_t,mpfr_rnd_t));
-#ifndef WANT_MINI_GMP
+#ifndef MPFR_USE_MINI_GMP
/* mini-gmp does not provide mpq_t, we disable the following functions */
__MPFR_DECLSPEC int
mpfr_set_q _MPFR_PROTO ((mpfr_ptr, mpq_srcptr, mpfr_rnd_t));
diff --git a/src/nrandom.c b/src/nrandom.c
index f4b8a0708..912562792 100644
--- a/src/nrandom.c
+++ b/src/nrandom.c
@@ -53,7 +53,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
/* this file cannot be compiled with mini-gmp since it relies on
mpfr_random_deviate_value which needs mpq_t */
-#ifndef WANT_MINI_GMP
+#ifndef MPFR_USE_MINI_GMP
#include "random_deviate.h"
/* Algorithm H: true with probability exp(-1/2). */
diff --git a/src/printf.c b/src/printf.c
index c766ee2db..98337496c 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -26,7 +26,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
/* The mpfr_printf-like functions are defined only if <stdarg.h> exists.
Since they use mpf_t, they cannot be defined with mini-gmp. */
-#if defined(HAVE_STDARG) && !defined(WANT_MINI_GMP)
+#if defined(HAVE_STDARG) && !defined(MPFR_USE_MINI_GMP)
#include <stdarg.h>
diff --git a/src/random_deviate.c b/src/random_deviate.c
index 5bfc96cbe..7690dec99 100644
--- a/src/random_deviate.c
+++ b/src/random_deviate.c
@@ -37,7 +37,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
*/
/* this file cannot compile with mini-gmp since it uses mpq_t */
-#ifndef WANT_MINI_GMP
+#ifndef MPFR_USE_MINI_GMP
#define MPFR_NEED_LONGLONG_H
#include "random_deviate.h"
diff --git a/src/set_f.c b/src/set_f.c
index ef15c2569..891d2bf34 100644
--- a/src/set_f.c
+++ b/src/set_f.c
@@ -23,7 +23,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
#define MPFR_NEED_LONGLONG_H
#include "mpfr-impl.h"
-#ifndef WANT_MINI_GMP
+#ifndef MPFR_USE_MINI_GMP
int
mpfr_set_f (mpfr_ptr y, mpf_srcptr x, mpfr_rnd_t rnd_mode)
{
diff --git a/src/set_q.c b/src/set_q.c
index 4d7d9a8ae..cd497db20 100644
--- a/src/set_q.c
+++ b/src/set_q.c
@@ -60,7 +60,7 @@ set_z (mpfr_ptr f, mpz_srcptr z, mp_size_t *zs)
return -c;
}
-#ifndef WANT_MINI_GMP
+#ifndef MPFR_USE_MINI_GMP
/* set f to the rational q */
int
mpfr_set_q (mpfr_ptr f, mpq_srcptr q, mpfr_rnd_t rnd)
diff --git a/src/vasprintf.c b/src/vasprintf.c
index 999539975..ba19bd3a8 100644
--- a/src/vasprintf.c
+++ b/src/vasprintf.c
@@ -27,7 +27,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
/* The mpfr_printf-like functions are defined only if <stdarg.h> exists.
Since they use mpf_t, they cannot be defined with mini-gmp. */
-#if defined(HAVE_STDARG) && !defined(WANT_MINI_GMP)
+#if defined(HAVE_STDARG) && !defined(MPFR_USE_MINI_GMP)
#include <stdarg.h>