From d04846f9e1a66e8f5495d953c4cae3765d73b1d3 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Mon, 9 Aug 2010 08:25:00 +0200 Subject: [PATCH] Rename VALUE_TO_INT to ENTIER_TO_INT to avoid conflict with PolyLib's Conflict reported by Uday Kumar Reddy . Signed-off-by: Sven Verdoolaege --- include/piplib/piplib.h | 6 +++--- source/sol.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/piplib/piplib.h b/include/piplib/piplib.h index 0123c47..aa54b8b 100644 --- a/include/piplib/piplib.h +++ b/include/piplib/piplib.h @@ -41,7 +41,7 @@ # define VAL_UN 1LL # define VAL_ZERO 0LL -#define VALUE_TO_INT(val) ((int)(val)) +#define ENTIER_TO_INT(val) ((int)(val)) #define ENTIER_TO_DOUBLE(val) ((double)(val)) #elif defined(LINEAR_VALUE_IS_INT) @@ -51,7 +51,7 @@ # define VAL_UN 1L # define VAL_ZERO 0L -#define VALUE_TO_INT(val) ((int)(val)) +#define ENTIER_TO_INT(val) ((int)(val)) #define ENTIER_TO_DOUBLE(val) ((double)(val)) #elif defined(LINEAR_VALUE_IS_MP) @@ -61,7 +61,7 @@ # define FORMAT "%d" # define GMP_INPUT_FORMAT "%lZd" -#define VALUE_TO_INT(val) ((int)mpz_get_si(val)) +#define ENTIER_TO_INT(val) ((int)mpz_get_si(val)) #define ENTIER_TO_DOUBLE(val) (mpz_get_d(val)) #endif diff --git a/source/sol.c b/source/sol.c index 584c387..16dac6d 100644 --- a/source/sol.c +++ b/source/sol.c @@ -540,7 +540,7 @@ PipVector * sol_vector_edit(int *i, int Bg, int Urs_p, int flags) exit(1) ; } p = sol_space + (*i) ; - n = VALUE_TO_INT(p->param1); + n = ENTIER_TO_INT(p->param1); if (flags & SOL_REMOVE) --n; n -= Urs_p; @@ -627,7 +627,7 @@ PipNewparm * sol_newparm_edit(int *i, int Bg, int Urs_p, int flags) exit(1) ; } newparm->vector = sol_vector_edit(i, Bg, Urs_p, flags); - newparm->rank = VALUE_TO_INT(p->param1); + newparm->rank = ENTIER_TO_INT(p->param1); /* On met p a jour pour lire le denominateur (un Val de param2 UN). */ p = sol_space + (*i) ; entier_init_set(newparm->deno, p->param1); -- 2.11.4.GIT