From dca95e673e71fbef7cb969b47f65642dc7edaf16 Mon Sep 17 00:00:00 2001 From: Tommy Hofmann Date: Thu, 2 Mar 2017 17:18:18 +0100 Subject: [PATCH] Change flint_abort to abort only if flint > 2.5.2 --- arf.h | 6 ++++++ bool_mat.h | 6 ++++++ dlog.h | 8 ++++++++ fmpr.h | 6 ++++++ fmpz_extras.h | 6 ++++++ mag.h | 6 ++++++ 6 files changed, 38 insertions(+) diff --git a/arf.h b/arf.h index 26ee101b..63badded 100644 --- a/arf.h +++ b/arf.h @@ -27,6 +27,12 @@ #include "fmpr.h" #include "mag.h" +#ifndef flint_abort +#if __FLINT_RELEASE <= 20502 +#define flint_abort abort +#endif +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/bool_mat.h b/bool_mat.h index 909f84f0..e35940b6 100644 --- a/bool_mat.h +++ b/bool_mat.h @@ -22,6 +22,12 @@ #include "flint/flint.h" #include "flint/fmpz_mat.h" +#ifndef flint_abort +#if __FLINT_RELEASE <= 20502 +#define flint_abort abort +#endif +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/dlog.h b/dlog.h index 3a475044..4453f277 100644 --- a/dlog.h +++ b/dlog.h @@ -18,6 +18,14 @@ #define DLOG_INLINE static __inline__ #endif +#include "flint/flint.h" + +#ifndef flint_abort +#if __FLINT_RELEASE <= 20502 +#define flint_abort abort +#endif +#endif + #include "flint/ulong_extras.h" #include "flint/nmod_vec.h" diff --git a/fmpr.h b/fmpr.h index 5ad662dd..7ba5706b 100644 --- a/fmpr.h +++ b/fmpr.h @@ -25,6 +25,12 @@ #include "flint/config.h" #include "fmpz_extras.h" +#ifndef flint_abort +#if __FLINT_RELEASE <= 20502 +#define flint_abort abort +#endif +#endif + #define TLS_PREFIX FLINT_TLS_PREFIX #if defined(_MSC_VER) && defined(ARB_BUILD_DLL) diff --git a/fmpz_extras.h b/fmpz_extras.h index a567eb12..10ddd80f 100644 --- a/fmpz_extras.h +++ b/fmpz_extras.h @@ -20,6 +20,12 @@ extern "C" { #endif +#ifndef flint_abort +#if __FLINT_RELEASE <= 20502 +#define flint_abort abort +#endif +#endif + /* currently defined in the arb module, but global to the library */ double arb_test_multiplier(void); diff --git a/mag.h b/mag.h index fea8dd21..06f2ac30 100644 --- a/mag.h +++ b/mag.h @@ -24,6 +24,12 @@ #include "flint/fmpz.h" #include "fmpz_extras.h" +#ifndef flint_abort +#if __FLINT_RELEASE <= 20502 +#define flint_abort abort +#endif +#endif + #ifdef __cplusplus extern "C" { #endif