diff options
Diffstat (limited to 'src/misc')
| -rw-r--r-- | src/misc/compat.h | 21 | ||||
| -rw-r--r-- | src/misc/config.c | 4 | ||||
| -rw-r--r-- | src/misc/config.h | 4 |
3 files changed, 18 insertions, 11 deletions
diff --git a/src/misc/compat.h b/src/misc/compat.h index 7e3d4e8..ccacb2e 100644 --- a/src/misc/compat.h +++ b/src/misc/compat.h @@ -12,17 +12,24 @@ #define PARI_VERSION_MINOR (((PARI_VERSION_CODE) >> 8) & 0xff) #define PARI_VERSION_MAJOR (PARI_VERSION_CODE >> 16) -#define PARI_VERSION_GT(a,b,c) ((PARI_VERSION_MAJOR == a && PARI_VERSION_MINOR == b && PARI_VERSION_PATCH > c) || (PARI_VERSION_MAJOR == a && PARI_VERSION_MINOR > b) || (PARI_VERSION_MAJOR > a)) -#define PARI_VERSION_EQ(a,b,c) (PARI_VERSION_MAJOR == a && PARI_VERSION_MINOR == b && PARI_VERSION_PATCH == c) -#define PARI_VERSION_GE(a,b,c) (PARI_VERSION_GT(a,b,c) || PARI_VERSION_EQ(a,b,c)) -#define PARI_VERSION_LT(a,b,c) !(PARI_VERSION_GE(a,b,c)) -#define PARI_VERSION_LE(a,b,c) !(PARI_VERSION_GT(a,b,c)) +#define PARI_VERSION_GT(a, b, c) \ + ((PARI_VERSION_MAJOR == a && PARI_VERSION_MINOR == b && \ + PARI_VERSION_PATCH > c) || \ + (PARI_VERSION_MAJOR == a && PARI_VERSION_MINOR > b) || \ + (PARI_VERSION_MAJOR > a)) +#define PARI_VERSION_EQ(a, b, c) \ + (PARI_VERSION_MAJOR == a && PARI_VERSION_MINOR == b && \ + PARI_VERSION_PATCH == c) +#define PARI_VERSION_GE(a, b, c) \ + (PARI_VERSION_GT(a, b, c) || PARI_VERSION_EQ(a, b, c)) +#define PARI_VERSION_LT(a, b, c) !(PARI_VERSION_GE(a, b, c)) +#define PARI_VERSION_LE(a, b, c) !(PARI_VERSION_GT(a, b, c)) -#if PARI_VERSION_LT(2,12,1) +#if PARI_VERSION_LT(2, 12, 1) #define polisirreducible isirreducible #endif -#if PARI_VERSION_LT(2,15,0) +#if PARI_VERSION_LT(2, 15, 0) #define znorder(x, o) order(x); #endif diff --git a/src/misc/config.c b/src/misc/config.c index 155cbb4..9f66b51 100644 --- a/src/misc/config.c +++ b/src/misc/config.c @@ -15,7 +15,7 @@ config_names_t *cfg_used = &cfg_used_s; config_names_t cfg_set_s = {0}; config_names_t *cfg_set = &cfg_set_s; -void config_report_unused() { +void config_report_unused(void) { bool unused = false; if (cfg_set->field && !cfg_used->field) { fprintf( @@ -120,4 +120,4 @@ void config_report_unused() { #else (void)unused; #endif -}
\ No newline at end of file +} diff --git a/src/misc/config.h b/src/misc/config.h index 3272190..b4fbc79 100644 --- a/src/misc/config.h +++ b/src/misc/config.h @@ -129,7 +129,7 @@ typedef struct { char *datadir; /** @brief How much memory to allocate for the PARI stack. */ unsigned long memory; - /** @brief How many threads to use, only useful for invalid generation(atm). + /** @brief How many threads to use (or limit PARI to use). */ unsigned long threads; /** @brief How much memory to allocate for the PARI stack, per thread. */ @@ -191,6 +191,6 @@ extern config_names_t *cfg_set; #define GET_BOOL(x) ((cfg_used->x = true) && cfg->x) #define SET(x) cfg_set->x = true -void config_report_unused(); +void config_report_unused(void); #endif // ECGEN_MISC_CONFIG_H |