diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | demos/expr/expr-impl.h | 14 | ||||
| -rw-r--r-- | demos/expr/expr.c | 6 | ||||
| -rw-r--r-- | demos/expr/expr.h | 20 | ||||
| -rw-r--r-- | demos/expr/exprf.c | 10 | ||||
| -rw-r--r-- | demos/expr/exprfa.c | 6 | ||||
| -rw-r--r-- | demos/expr/exprq.c | 10 | ||||
| -rw-r--r-- | demos/expr/exprqa.c | 6 | ||||
| -rw-r--r-- | demos/expr/exprz.c | 10 | ||||
| -rw-r--r-- | demos/expr/exprza.c | 6 | ||||
| -rw-r--r-- | gmp-h.in | 67 |
11 files changed, 78 insertions, 80 deletions
@@ -4,9 +4,10 @@ * tests/mpz/t-invert.c: Avoid testing mod 0. * doc/gmp.texi (mpz_invert): Specify mod 0 is not handled. - * gmp-h.in (__gmp_signed): Remove. + * gmp-h.in (__gmp_signed, __gmp_const): Remove. (__GMP_HAVE_TOKEN_PASTE, __GMP_HAVE_CONST): Remove. * gmp-impl.h: Strip __GMP_HAVE_TOKEN_PASTE and __GMP_HAVE_CONST. + * demos/expr/: Strip __gmp_const usage from all files. * tests/mpz/t-powm.c (allsizes_seen): Require unsigned*. diff --git a/demos/expr/expr-impl.h b/demos/expr/expr-impl.h index 3461f7d37..aa2732b10 100644 --- a/demos/expr/expr-impl.h +++ b/demos/expr/expr-impl.h @@ -53,7 +53,7 @@ union mpX_t { }; typedef union mpX_t *mpX_ptr; -typedef __gmp_const union mpX_t *mpX_srcptr; +typedef const union mpX_t *mpX_srcptr; typedef void (*mpexpr_fun_one_t) (mpX_ptr); typedef unsigned long (*mpexpr_fun_ui_one_t) (mpX_ptr); @@ -76,31 +76,31 @@ typedef void (*mpexpr_fun_ternary_ui_t) (mpX_ptr, mpX_srcptr, mpX_srcptr, unsign typedef int (*mpexpr_fun_i_ternary_t) (mpX_srcptr, mpX_srcptr, mpX_srcptr); typedef int (*mpexpr_fun_i_ternary_ui_t) (mpX_srcptr, mpX_srcptr, unsigned long); -typedef size_t (*mpexpr_fun_number_t) (mpX_ptr, __gmp_const char *str, size_t len, int base); +typedef size_t (*mpexpr_fun_number_t) (mpX_ptr, const char *str, size_t len, int base); typedef void (*mpexpr_fun_swap_t) (mpX_ptr, mpX_ptr); typedef unsigned long (*mpexpr_fun_get_ui_t) (mpX_srcptr); typedef void (*mpexpr_fun_set_si_t) (mpX_srcptr, long); struct mpexpr_control_t { - __gmp_const struct mpexpr_operator_t *op; + const struct mpexpr_operator_t *op; int argcount; }; #define MPEXPR_VARIABLES 26 struct mpexpr_parse_t { - __gmp_const struct mpexpr_operator_t *table; + const struct mpexpr_operator_t *table; mpX_ptr res; int base; unsigned long prec; - __gmp_const char *e; + const char *e; size_t elen; mpX_srcptr *var; int error_code; int token; - __gmp_const struct mpexpr_operator_t *token_op; + const struct mpexpr_operator_t *token_op; union mpX_t *data_stack; int data_top; @@ -126,4 +126,4 @@ struct mpexpr_parse_t { int mpexpr_evaluate (struct mpexpr_parse_t *p); int mpexpr_va_to_var (void *var[], va_list ap); -size_t mpexpr_mpz_number (mpz_ptr res, __gmp_const char *e, size_t elen, int base); +size_t mpexpr_mpz_number (mpz_ptr res, const char *e, size_t elen, int base); diff --git a/demos/expr/expr.c b/demos/expr/expr.c index f78c32173..1788d2941 100644 --- a/demos/expr/expr.c +++ b/demos/expr/expr.c @@ -136,7 +136,7 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ static int lookahead (struct mpexpr_parse_t *p, int prefix) { - __gmp_const struct mpexpr_operator_t *op, *op_found; + const struct mpexpr_operator_t *op, *op_found; size_t oplen, oplen_found, wlen; int i; @@ -278,7 +278,7 @@ lookahead (struct mpexpr_parse_t *p, int prefix) a reference through CP. */ #define CONTROL_PUSH(opptr,args) \ do { \ - __gmp_const struct mpexpr_operator_t *op = opptr; \ + const struct mpexpr_operator_t *op = opptr; \ struct mpexpr_control_t *cp; \ CONTROL_SPACE (); \ p->control_top++; \ @@ -371,7 +371,7 @@ mpexpr_evaluate (struct mpexpr_parse_t *p) /* "done" is a special sentinel at the bottom of the control stack, precedence -1 is lower than any normal operator. */ { - static __gmp_const struct mpexpr_operator_t operator_done + static const struct mpexpr_operator_t operator_done = { "DONE", NULL, MPEXPR_TYPE_DONE, -1 }; p->control_alloc = 20; diff --git a/demos/expr/expr.h b/demos/expr/expr.h index 128150f86..eb9fc8f4c 100644 --- a/demos/expr/expr.h +++ b/demos/expr/expr.h @@ -101,23 +101,23 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ typedef void (*mpexpr_fun_t) (void); struct mpexpr_operator_t { - __gmp_const char *name; + const char *name; mpexpr_fun_t fun; int type; int precedence; }; -int mpf_expr_a (__gmp_const struct mpexpr_operator_t *, mpf_ptr, int, - unsigned long,__gmp_const char *, size_t, mpf_srcptr [26]); -int mpf_expr (mpf_ptr, int, __gmp_const char *, ...); +int mpf_expr_a (const struct mpexpr_operator_t *, mpf_ptr, int, + unsigned long,const char *, size_t, mpf_srcptr [26]); +int mpf_expr (mpf_ptr, int, const char *, ...); -int mpq_expr_a (__gmp_const struct mpexpr_operator_t *, mpq_ptr, - int, __gmp_const char *, size_t, mpq_srcptr [26]); -int mpq_expr (mpq_ptr, int, __gmp_const char *, ...); +int mpq_expr_a (const struct mpexpr_operator_t *, mpq_ptr, + int, const char *, size_t, mpq_srcptr [26]); +int mpq_expr (mpq_ptr, int, const char *, ...); -int mpz_expr_a (__gmp_const struct mpexpr_operator_t *, mpz_ptr, int, - __gmp_const char *, size_t, mpz_srcptr [26]); -int mpz_expr (mpz_ptr, int, __gmp_const char *, ...); +int mpz_expr_a (const struct mpexpr_operator_t *, mpz_ptr, int, + const char *, size_t, mpz_srcptr [26]); +int mpz_expr (mpz_ptr, int, const char *, ...); #endif diff --git a/demos/expr/exprf.c b/demos/expr/exprf.c index c67ee5178..777daec37 100644 --- a/demos/expr/exprf.c +++ b/demos/expr/exprf.c @@ -34,7 +34,7 @@ e_mpf_sgn (mpf_srcptr x) } -static __gmp_const struct mpexpr_operator_t _mpf_expr_standard_table[] = { +static const struct mpexpr_operator_t _mpf_expr_standard_table[] = { { "**", (mpexpr_fun_t) mpf_pow_ui, MPEXPR_TYPE_BINARY_UI | MPEXPR_TYPE_RIGHTASSOC, 220 }, @@ -88,13 +88,13 @@ static __gmp_const struct mpexpr_operator_t _mpf_expr_standard_table[] = { { NULL } }; -__gmp_const struct mpexpr_operator_t * __gmp_const mpf_expr_standard_table +const struct mpexpr_operator_t * const mpf_expr_standard_table = _mpf_expr_standard_table; int #if HAVE_STDARG -mpf_expr (mpf_ptr res, int base, __gmp_const char *e, ...) +mpf_expr (mpf_ptr res, int base, const char *e, ...) #else mpf_expr (va_alist) va_dcl @@ -108,11 +108,11 @@ mpf_expr (va_alist) #else mpf_ptr res; int base; - __gmp_const char *e; + const char *e; va_start (ap); res = va_arg (ap, mpf_ptr); base = va_arg (ap, int); - e = va_arg (ap, __gmp_const char *); + e = va_arg (ap, const char *); #endif TRACE (printf ("mpf_expr(): base %d, %s\n", base, e)); diff --git a/demos/expr/exprfa.c b/demos/expr/exprfa.c index 1cc00e0f0..4ab294e08 100644 --- a/demos/expr/exprfa.c +++ b/demos/expr/exprfa.c @@ -35,7 +35,7 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ static size_t -e_mpf_number (mpf_ptr res, __gmp_const char *e, size_t elen, int base) +e_mpf_number (mpf_ptr res, const char *e, size_t elen, int base) { char *edup; size_t i, ret, extra=0; @@ -151,9 +151,9 @@ e_mpf_set_or_swap (mpf_ptr w, mpf_ptr x) int -mpf_expr_a (__gmp_const struct mpexpr_operator_t *table, +mpf_expr_a (const struct mpexpr_operator_t *table, mpf_ptr res, int base, unsigned long prec, - __gmp_const char *e, size_t elen, + const char *e, size_t elen, mpf_srcptr var[26]) { struct mpexpr_parse_t p; diff --git a/demos/expr/exprq.c b/demos/expr/exprq.c index af91b0016..9b4b8574d 100644 --- a/demos/expr/exprq.c +++ b/demos/expr/exprq.c @@ -72,7 +72,7 @@ e_mpq_den (mpq_ptr w, mpq_srcptr x) } -static __gmp_const struct mpexpr_operator_t _mpq_expr_standard_table[] = { +static const struct mpexpr_operator_t _mpq_expr_standard_table[] = { { "**", (mpexpr_fun_t) e_mpq_pow_ui, MPEXPR_TYPE_BINARY_UI | MPEXPR_TYPE_RIGHTASSOC, 220 }, @@ -121,13 +121,13 @@ static __gmp_const struct mpexpr_operator_t _mpq_expr_standard_table[] = { { NULL } }; -__gmp_const struct mpexpr_operator_t * __gmp_const mpq_expr_standard_table +const struct mpexpr_operator_t * const mpq_expr_standard_table = _mpq_expr_standard_table; int #if HAVE_STDARG -mpq_expr (mpq_ptr res, int base, __gmp_const char *e, ...) +mpq_expr (mpq_ptr res, int base, const char *e, ...) #else mpq_expr (va_alist) va_dcl @@ -141,11 +141,11 @@ mpq_expr (va_alist) #else mpq_ptr res; int base; - __gmp_const char *e; + const char *e; va_start (ap); res = va_arg (ap, mpq_ptr); base = va_arg (ap, int); - e = va_arg (ap, __gmp_const char *); + e = va_arg (ap, const char *); #endif TRACE (printf ("mpq_expr(): base %d, %s\n", base, e)); diff --git a/demos/expr/exprqa.c b/demos/expr/exprqa.c index c56f1ca69..8eaf60248 100644 --- a/demos/expr/exprqa.c +++ b/demos/expr/exprqa.c @@ -46,7 +46,7 @@ e_mpq_set_si1 (mpq_ptr q, long num) /* The same as mpz, but putting the result in the numerator. Negatives and fractions aren't parsed here because '-' and '/' are operators. */ static size_t -e_mpq_number (mpq_ptr res, __gmp_const char *e, size_t elen, int base) +e_mpq_number (mpq_ptr res, const char *e, size_t elen, int base) { mpz_set_ui (mpq_denref (res), 1L); return mpexpr_mpz_number (mpq_numref (res), e, elen, base); @@ -61,9 +61,9 @@ e_mpq_init (mpq_ptr q, unsigned long prec) } int -mpq_expr_a (__gmp_const struct mpexpr_operator_t *table, +mpq_expr_a (const struct mpexpr_operator_t *table, mpq_ptr res, int base, - __gmp_const char *e, size_t elen, + const char *e, size_t elen, mpq_srcptr var[26]) { struct mpexpr_parse_t p; diff --git a/demos/expr/exprz.c b/demos/expr/exprz.c index 7c01b9dc5..ad5ee7dea 100644 --- a/demos/expr/exprz.c +++ b/demos/expr/exprz.c @@ -86,7 +86,7 @@ e_mpz_clrbit (mpz_ptr w, mpz_srcptr x, unsigned long n) mpz_clrbit (w, n); } -static __gmp_const struct mpexpr_operator_t _mpz_expr_standard_table[] = { +static const struct mpexpr_operator_t _mpz_expr_standard_table[] = { { "**", (mpexpr_fun_t) mpz_pow_ui, MPEXPR_TYPE_BINARY_UI | MPEXPR_TYPE_RIGHTASSOC, 220 }, @@ -172,13 +172,13 @@ static __gmp_const struct mpexpr_operator_t _mpz_expr_standard_table[] = { /* The table is available globally only through a pointer, so the table size can change without breaking binary compatibility. */ -__gmp_const struct mpexpr_operator_t * __gmp_const mpz_expr_standard_table +const struct mpexpr_operator_t * const mpz_expr_standard_table = _mpz_expr_standard_table; int #if HAVE_STDARG -mpz_expr (mpz_ptr res, int base, __gmp_const char *e, ...) +mpz_expr (mpz_ptr res, int base, const char *e, ...) #else mpz_expr (va_alist) va_dcl @@ -192,11 +192,11 @@ mpz_expr (va_alist) #else mpz_ptr res; int base; - __gmp_const char *e; + const char *e; va_start (ap); res = va_arg (ap, mpz_ptr); base = va_arg (ap, int); - e = va_arg (ap, __gmp_const char *); + e = va_arg (ap, const char *); #endif TRACE (printf ("mpz_expr(): base %d, %s\n", base, e)); diff --git a/demos/expr/exprza.c b/demos/expr/exprza.c index 81e16ce28..dc5442280 100644 --- a/demos/expr/exprza.c +++ b/demos/expr/exprza.c @@ -27,7 +27,7 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ /* No need to parse '-' since that's handled as an operator. This function also by mpq_expr_a, so it's not static. */ size_t -mpexpr_mpz_number (mpz_ptr res, __gmp_const char *e, size_t elen, int base) +mpexpr_mpz_number (mpz_ptr res, const char *e, size_t elen, int base) { char *edup; size_t i, ret; @@ -69,9 +69,9 @@ e_mpz_init (mpz_ptr z, unsigned long prec) } int -mpz_expr_a (__gmp_const struct mpexpr_operator_t *table, +mpz_expr_a (const struct mpexpr_operator_t *table, mpz_ptr res, int base, - __gmp_const char *e, size_t elen, + const char *e, size_t elen, mpz_srcptr var[26]) { struct mpexpr_parse_t p; @@ -99,9 +99,6 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ #endif -#define __gmp_const const - - /* __GMP_DECLSPEC supports Windows DLL versions of libgmp, and is empty in all other circumstances. @@ -204,7 +201,7 @@ typedef __mpz_struct MP_INT; /* gmp 1 source compatibility */ typedef __mpz_struct mpz_t[1]; typedef mp_limb_t * mp_ptr; -typedef __gmp_const mp_limb_t * mp_srcptr; +typedef const mp_limb_t * mp_srcptr; #if defined (_CRAY) && ! defined (_CRAYMPP) /* plain `int' is much faster (48 bits) */ #define __GMP_MP_SIZE_T_INT 1 @@ -261,11 +258,11 @@ typedef __gmp_randstate_struct gmp_randstate_t[1]; /* Types for function declarations in gmp files. */ /* ??? Should not pollute user name space with these ??? */ -typedef __gmp_const __mpz_struct *mpz_srcptr; +typedef const __mpz_struct *mpz_srcptr; typedef __mpz_struct *mpz_ptr; -typedef __gmp_const __mpf_struct *mpf_srcptr; +typedef const __mpf_struct *mpf_srcptr; typedef __mpf_struct *mpf_ptr; -typedef __gmp_const __mpq_struct *mpq_srcptr; +typedef const __mpq_struct *mpq_srcptr; typedef __mpq_struct *mpq_ptr; @@ -528,13 +525,13 @@ __GMP_DECLSPEC void mp_get_memory_functions (void *(**) (size_t), void (**) (void *, size_t)) __GMP_NOTHROW; #define mp_bits_per_limb __gmp_bits_per_limb -__GMP_DECLSPEC extern __gmp_const int mp_bits_per_limb; +__GMP_DECLSPEC extern const int mp_bits_per_limb; #define gmp_errno __gmp_errno __GMP_DECLSPEC extern int gmp_errno; #define gmp_version __gmp_version -__GMP_DECLSPEC extern __gmp_const char * __gmp_const gmp_version; +__GMP_DECLSPEC extern const char * const gmp_version; /**************** Random number routines. ****************/ @@ -556,7 +553,7 @@ __GMP_DECLSPEC int gmp_randinit_lc_2exp_size (gmp_randstate_t, mp_bitcnt_t); __GMP_DECLSPEC void gmp_randinit_mt (gmp_randstate_t); #define gmp_randinit_set __gmp_randinit_set -__GMP_DECLSPEC void gmp_randinit_set (gmp_randstate_t, __gmp_const __gmp_randstate_struct *); +__GMP_DECLSPEC void gmp_randinit_set (gmp_randstate_t, const __gmp_randstate_struct *); #define gmp_randseed __gmp_randseed __GMP_DECLSPEC void gmp_randseed (gmp_randstate_t, mpz_srcptr); @@ -577,55 +574,55 @@ __GMP_DECLSPEC unsigned long gmp_urandomm_ui (gmp_randstate_t, unsigned long); /**************** Formatted output routines. ****************/ #define gmp_asprintf __gmp_asprintf -__GMP_DECLSPEC int gmp_asprintf (char **, __gmp_const char *, ...); +__GMP_DECLSPEC int gmp_asprintf (char **, const char *, ...); #define gmp_fprintf __gmp_fprintf #ifdef _GMP_H_HAVE_FILE -__GMP_DECLSPEC int gmp_fprintf (FILE *, __gmp_const char *, ...); +__GMP_DECLSPEC int gmp_fprintf (FILE *, const char *, ...); #endif #define gmp_obstack_printf __gmp_obstack_printf #if defined (_GMP_H_HAVE_OBSTACK) -__GMP_DECLSPEC int gmp_obstack_printf (struct obstack *, __gmp_const char *, ...); +__GMP_DECLSPEC int gmp_obstack_printf (struct obstack *, const char *, ...); #endif #define gmp_obstack_vprintf __gmp_obstack_vprintf #if defined (_GMP_H_HAVE_OBSTACK) && defined (_GMP_H_HAVE_VA_LIST) -__GMP_DECLSPEC int gmp_obstack_vprintf (struct obstack *, __gmp_const char *, va_list); +__GMP_DECLSPEC int gmp_obstack_vprintf (struct obstack *, const char *, va_list); #endif #define gmp_printf __gmp_printf -__GMP_DECLSPEC int gmp_printf (__gmp_const char *, ...); +__GMP_DECLSPEC int gmp_printf (const char *, ...); #define gmp_snprintf __gmp_snprintf -__GMP_DECLSPEC int gmp_snprintf (char *, size_t, __gmp_const char *, ...); +__GMP_DECLSPEC int gmp_snprintf (char *, size_t, const char *, ...); #define gmp_sprintf __gmp_sprintf -__GMP_DECLSPEC int gmp_sprintf (char *, __gmp_const char *, ...); +__GMP_DECLSPEC int gmp_sprintf (char *, const char *, ...); #define gmp_vasprintf __gmp_vasprintf #if defined (_GMP_H_HAVE_VA_LIST) -__GMP_DECLSPEC int gmp_vasprintf (char **, __gmp_const char *, va_list); +__GMP_DECLSPEC int gmp_vasprintf (char **, const char *, va_list); #endif #define gmp_vfprintf __gmp_vfprintf #if defined (_GMP_H_HAVE_FILE) && defined (_GMP_H_HAVE_VA_LIST) -__GMP_DECLSPEC int gmp_vfprintf (FILE *, __gmp_const char *, va_list); +__GMP_DECLSPEC int gmp_vfprintf (FILE *, const char *, va_list); #endif #define gmp_vprintf __gmp_vprintf #if defined (_GMP_H_HAVE_VA_LIST) -__GMP_DECLSPEC int gmp_vprintf (__gmp_const char *, va_list); +__GMP_DECLSPEC int gmp_vprintf (const char *, va_list); #endif #define gmp_vsnprintf __gmp_vsnprintf #if defined (_GMP_H_HAVE_VA_LIST) -__GMP_DECLSPEC int gmp_vsnprintf (char *, size_t, __gmp_const char *, va_list); +__GMP_DECLSPEC int gmp_vsnprintf (char *, size_t, const char *, va_list); #endif #define gmp_vsprintf __gmp_vsprintf #if defined (_GMP_H_HAVE_VA_LIST) -__GMP_DECLSPEC int gmp_vsprintf (char *, __gmp_const char *, va_list); +__GMP_DECLSPEC int gmp_vsprintf (char *, const char *, va_list); #endif @@ -633,28 +630,28 @@ __GMP_DECLSPEC int gmp_vsprintf (char *, __gmp_const char *, va_list); #define gmp_fscanf __gmp_fscanf #ifdef _GMP_H_HAVE_FILE -__GMP_DECLSPEC int gmp_fscanf (FILE *, __gmp_const char *, ...); +__GMP_DECLSPEC int gmp_fscanf (FILE *, const char *, ...); #endif #define gmp_scanf __gmp_scanf -__GMP_DECLSPEC int gmp_scanf (__gmp_const char *, ...); +__GMP_DECLSPEC int gmp_scanf (const char *, ...); #define gmp_sscanf __gmp_sscanf -__GMP_DECLSPEC int gmp_sscanf (__gmp_const char *, __gmp_const char *, ...); +__GMP_DECLSPEC int gmp_sscanf (const char *, const char *, ...); #define gmp_vfscanf __gmp_vfscanf #if defined (_GMP_H_HAVE_FILE) && defined (_GMP_H_HAVE_VA_LIST) -__GMP_DECLSPEC int gmp_vfscanf (FILE *, __gmp_const char *, va_list); +__GMP_DECLSPEC int gmp_vfscanf (FILE *, const char *, va_list); #endif #define gmp_vscanf __gmp_vscanf #if defined (_GMP_H_HAVE_VA_LIST) -__GMP_DECLSPEC int gmp_vscanf (__gmp_const char *, va_list); +__GMP_DECLSPEC int gmp_vscanf (const char *, va_list); #endif #define gmp_vsscanf __gmp_vsscanf #if defined (_GMP_H_HAVE_VA_LIST) -__GMP_DECLSPEC int gmp_vsscanf (__gmp_const char *, __gmp_const char *, va_list); +__GMP_DECLSPEC int gmp_vsscanf (const char *, const char *, va_list); #endif @@ -884,7 +881,7 @@ __GMP_DECLSPEC mp_limb_t mpz_getlimbn (mpz_srcptr, mp_size_t) __GMP_NOTHROW __GM __GMP_DECLSPEC mp_bitcnt_t mpz_hamdist (mpz_srcptr, mpz_srcptr) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE; #define mpz_import __gmpz_import -__GMP_DECLSPEC void mpz_import (mpz_ptr, size_t, int, size_t, int, size_t, __gmp_const void *); +__GMP_DECLSPEC void mpz_import (mpz_ptr, size_t, int, size_t, int, size_t, const void *); #define mpz_init __gmpz_init __GMP_DECLSPEC void mpz_init (mpz_ptr); @@ -905,7 +902,7 @@ __GMP_DECLSPEC void mpz_init_set_d (mpz_ptr, double); __GMP_DECLSPEC void mpz_init_set_si (mpz_ptr, signed long int); #define mpz_init_set_str __gmpz_init_set_str -__GMP_DECLSPEC int mpz_init_set_str (mpz_ptr, __gmp_const char *, int); +__GMP_DECLSPEC int mpz_init_set_str (mpz_ptr, const char *, int); #define mpz_init_set_ui __gmpz_init_set_ui __GMP_DECLSPEC void mpz_init_set_ui (mpz_ptr, unsigned long int); @@ -1068,7 +1065,7 @@ __GMP_DECLSPEC void mpz_set_q (mpz_ptr, mpq_srcptr); __GMP_DECLSPEC void mpz_set_si (mpz_ptr, signed long int); #define mpz_set_str __gmpz_set_str -__GMP_DECLSPEC int mpz_set_str (mpz_ptr, __gmp_const char *, int); +__GMP_DECLSPEC int mpz_set_str (mpz_ptr, const char *, int); #define mpz_set_ui __gmpz_set_ui __GMP_DECLSPEC void mpz_set_ui (mpz_ptr, unsigned long int); @@ -1250,7 +1247,7 @@ __GMP_DECLSPEC void mpq_set_num (mpq_ptr, mpz_srcptr); __GMP_DECLSPEC void mpq_set_si (mpq_ptr, signed long int, unsigned long int); #define mpq_set_str __gmpq_set_str -__GMP_DECLSPEC int mpq_set_str (mpq_ptr, __gmp_const char *, int); +__GMP_DECLSPEC int mpq_set_str (mpq_ptr, const char *, int); #define mpq_set_ui __gmpq_set_ui __GMP_DECLSPEC void mpq_set_ui (mpq_ptr, unsigned long int, unsigned long int); @@ -1372,7 +1369,7 @@ __GMP_DECLSPEC void mpf_init_set_d (mpf_ptr, double); __GMP_DECLSPEC void mpf_init_set_si (mpf_ptr, signed long int); #define mpf_init_set_str __gmpf_init_set_str -__GMP_DECLSPEC int mpf_init_set_str (mpf_ptr, __gmp_const char *, int); +__GMP_DECLSPEC int mpf_init_set_str (mpf_ptr, const char *, int); #define mpf_init_set_ui __gmpf_init_set_ui __GMP_DECLSPEC void mpf_init_set_ui (mpf_ptr, unsigned long int); @@ -1433,7 +1430,7 @@ __GMP_DECLSPEC void mpf_set_q (mpf_ptr, mpq_srcptr); __GMP_DECLSPEC void mpf_set_si (mpf_ptr, signed long int); #define mpf_set_str __gmpf_set_str -__GMP_DECLSPEC int mpf_set_str (mpf_ptr, __gmp_const char *, int); +__GMP_DECLSPEC int mpf_set_str (mpf_ptr, const char *, int); #define mpf_set_ui __gmpf_set_ui __GMP_DECLSPEC void mpf_set_ui (mpf_ptr, unsigned long int); @@ -1596,7 +1593,7 @@ __GMP_DECLSPEC mp_bitcnt_t mpn_scan0 (mp_srcptr, mp_bitcnt_t) __GMP_ATTRIBUTE_PU __GMP_DECLSPEC mp_bitcnt_t mpn_scan1 (mp_srcptr, mp_bitcnt_t) __GMP_ATTRIBUTE_PURE; #define mpn_set_str __MPN(set_str) -__GMP_DECLSPEC mp_size_t mpn_set_str (mp_ptr, __gmp_const unsigned char *, size_t, int); +__GMP_DECLSPEC mp_size_t mpn_set_str (mp_ptr, const unsigned char *, size_t, int); #define mpn_sqrtrem __MPN(sqrtrem) __GMP_DECLSPEC mp_size_t mpn_sqrtrem (mp_ptr, mp_ptr, mp_srcptr, mp_size_t); |