diff options
author | Torbjorn Granlund <tege@gmplib.org> | 2012-03-03 15:40:45 +0100 |
---|---|---|
committer | Torbjorn Granlund <tege@gmplib.org> | 2012-03-03 15:40:45 +0100 |
commit | b2629475d8f5f11c3c588046384f2e9c1f34e0a9 (patch) | |
tree | f1d4cc926369aba8115e8b82444c59e49df958bb /demos | |
parent | a709379e498a3aa2184a4e7eea00ac49866fbd85 (diff) | |
download | gmp-b2629475d8f5f11c3c588046384f2e9c1f34e0a9.tar.gz |
Clean out __GMP_PROTO.
Diffstat (limited to 'demos')
-rw-r--r-- | demos/expr/expr-impl.h | 62 | ||||
-rw-r--r-- | demos/expr/expr.h | 26 | ||||
-rw-r--r-- | demos/pexpr.c | 30 | ||||
-rw-r--r-- | demos/primes.c | 6 |
4 files changed, 56 insertions, 68 deletions
diff --git a/demos/expr/expr-impl.h b/demos/expr/expr-impl.h index e6050c562..3461f7d37 100644 --- a/demos/expr/expr-impl.h +++ b/demos/expr/expr-impl.h @@ -55,36 +55,31 @@ union mpX_t { typedef union mpX_t *mpX_ptr; typedef __gmp_const union mpX_t *mpX_srcptr; -typedef void (*mpexpr_fun_one_t) __GMP_PROTO ((mpX_ptr)); -typedef unsigned long (*mpexpr_fun_ui_one_t) __GMP_PROTO ((mpX_ptr)); - -typedef void (*mpexpr_fun_0ary_t) __GMP_PROTO ((mpX_ptr)); -typedef int (*mpexpr_fun_i_0ary_t) __GMP_PROTO ((void)); - -typedef void (*mpexpr_fun_unary_t) __GMP_PROTO ((mpX_ptr, mpX_srcptr)); -typedef void (*mpexpr_fun_unary_ui_t) __GMP_PROTO ((mpX_ptr, unsigned long)); -typedef int (*mpexpr_fun_i_unary_t) __GMP_PROTO ((mpX_srcptr)); -typedef int (*mpexpr_fun_i_unary_ui_t) __GMP_PROTO ((unsigned long)); - -typedef void (*mpexpr_fun_binary_t) __GMP_PROTO ((mpX_ptr, mpX_srcptr, mpX_srcptr)); -typedef void (*mpexpr_fun_binary_ui_t) __GMP_PROTO ((mpX_ptr, mpX_srcptr, unsigned long)); -typedef int (*mpexpr_fun_i_binary_t) __GMP_PROTO ((mpX_srcptr, mpX_srcptr)); -typedef int (*mpexpr_fun_i_binary_ui_t) __GMP_PROTO ((mpX_srcptr, unsigned long)); - -typedef void (*mpexpr_fun_ternary_t) - __GMP_PROTO ((mpX_ptr, mpX_srcptr, mpX_srcptr, mpX_srcptr)); -typedef void (*mpexpr_fun_ternary_ui_t) - __GMP_PROTO ((mpX_ptr, mpX_srcptr, mpX_srcptr, unsigned long)); -typedef int (*mpexpr_fun_i_ternary_t) - __GMP_PROTO ((mpX_srcptr, mpX_srcptr, mpX_srcptr)); -typedef int (*mpexpr_fun_i_ternary_ui_t) - __GMP_PROTO ((mpX_srcptr, mpX_srcptr, unsigned long)); - -typedef size_t (*mpexpr_fun_number_t) - __GMP_PROTO ((mpX_ptr, __gmp_const char *str, size_t len, int base)); -typedef void (*mpexpr_fun_swap_t) __GMP_PROTO ((mpX_ptr, mpX_ptr)); -typedef unsigned long (*mpexpr_fun_get_ui_t) __GMP_PROTO ((mpX_srcptr)); -typedef void (*mpexpr_fun_set_si_t) __GMP_PROTO ((mpX_srcptr, long)); +typedef void (*mpexpr_fun_one_t) (mpX_ptr); +typedef unsigned long (*mpexpr_fun_ui_one_t) (mpX_ptr); + +typedef void (*mpexpr_fun_0ary_t) (mpX_ptr); +typedef int (*mpexpr_fun_i_0ary_t) (void); + +typedef void (*mpexpr_fun_unary_t) (mpX_ptr, mpX_srcptr); +typedef void (*mpexpr_fun_unary_ui_t) (mpX_ptr, unsigned long); +typedef int (*mpexpr_fun_i_unary_t) (mpX_srcptr); +typedef int (*mpexpr_fun_i_unary_ui_t) (unsigned long); + +typedef void (*mpexpr_fun_binary_t) (mpX_ptr, mpX_srcptr, mpX_srcptr); +typedef void (*mpexpr_fun_binary_ui_t) (mpX_ptr, mpX_srcptr, unsigned long); +typedef int (*mpexpr_fun_i_binary_t) (mpX_srcptr, mpX_srcptr); +typedef int (*mpexpr_fun_i_binary_ui_t) (mpX_srcptr, unsigned long); + +typedef void (*mpexpr_fun_ternary_t) (mpX_ptr, mpX_srcptr, mpX_srcptr, mpX_srcptr); +typedef void (*mpexpr_fun_ternary_ui_t) (mpX_ptr, mpX_srcptr, mpX_srcptr, unsigned long); +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 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; @@ -129,7 +124,6 @@ struct mpexpr_parse_t { }; -int mpexpr_evaluate __GMP_PROTO ((struct mpexpr_parse_t *p)); -int mpexpr_va_to_var __GMP_PROTO ((void *var[], va_list ap)); -size_t mpexpr_mpz_number __GMP_PROTO ((mpz_ptr res, - __gmp_const char *e, size_t elen, int base)); +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); diff --git a/demos/expr/expr.h b/demos/expr/expr.h index c3525b61e..128150f86 100644 --- a/demos/expr/expr.h +++ b/demos/expr/expr.h @@ -98,7 +98,7 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ #define MPEXPR_TYPE_OPERATOR 0x2000 -typedef void (*mpexpr_fun_t) __GMP_PROTO ((void)); +typedef void (*mpexpr_fun_t) (void); struct mpexpr_operator_t { __gmp_const char *name; @@ -108,22 +108,16 @@ struct mpexpr_operator_t { }; -int mpf_expr_a __GMP_PROTO ((__gmp_const struct mpexpr_operator_t *table, - mpf_ptr res, int base, unsigned long prec, - __gmp_const char *e, size_t elen, - mpf_srcptr var[26])); -int mpf_expr __GMP_PROTO ((mpf_ptr res, int base, __gmp_const char *e, ...)); +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 mpq_expr_a __GMP_PROTO ((__gmp_const struct mpexpr_operator_t *table, - mpq_ptr res, int base, - __gmp_const char *e, size_t elen, - mpq_srcptr var[26])); -int mpq_expr __GMP_PROTO ((mpq_ptr res, int base, __gmp_const char *e, ...)); +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 mpz_expr_a __GMP_PROTO ((__gmp_const struct mpexpr_operator_t *table, - mpz_ptr res, int base, - __gmp_const char *e, size_t elen, - mpz_srcptr var[26])); -int mpz_expr __GMP_PROTO ((mpz_ptr res, int base, __gmp_const char *e, ...)); +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 *, ...); #endif diff --git a/demos/pexpr.c b/demos/pexpr.c index ec4eecbb2..f07eaffd4 100644 --- a/demos/pexpr.c +++ b/demos/pexpr.c @@ -109,21 +109,21 @@ struct expr typedef struct expr *expr_t; -void cleanup_and_exit __GMP_PROTO ((int)); - -char *skipspace __GMP_PROTO ((char *)); -void makeexp __GMP_PROTO ((expr_t *, enum op_t, expr_t, expr_t)); -void free_expr __GMP_PROTO ((expr_t)); -char *expr __GMP_PROTO ((char *, expr_t *)); -char *term __GMP_PROTO ((char *, expr_t *)); -char *power __GMP_PROTO ((char *, expr_t *)); -char *factor __GMP_PROTO ((char *, expr_t *)); -int match __GMP_PROTO ((char *, char *)); -int matchp __GMP_PROTO ((char *, char *)); -int cputime __GMP_PROTO ((void)); - -void mpz_eval_expr __GMP_PROTO ((mpz_ptr, expr_t)); -void mpz_eval_mod_expr __GMP_PROTO ((mpz_ptr, expr_t, mpz_ptr)); +void cleanup_and_exit (int); + +char *skipspace (char *); +void makeexp (expr_t *, enum op_t, expr_t, expr_t); +void free_expr (expr_t); +char *expr (char *, expr_t *); +char *term (char *, expr_t *); +char *power (char *, expr_t *); +char *factor (char *, expr_t *); +int match (char *, char *); +int matchp (char *, char *); +int cputime (void); + +void mpz_eval_expr (mpz_ptr, expr_t); +void mpz_eval_mod_expr (mpz_ptr, expr_t, mpz_ptr); char *error; int flag_print = 1; diff --git a/demos/primes.c b/demos/primes.c index 5e078bd38..9e141f46b 100644 --- a/demos/primes.c +++ b/demos/primes.c @@ -61,9 +61,9 @@ struct primes struct primes *primes; unsigned long n_primes; -void find_primes __GMP_PROTO ((unsigned char *, mpz_t, unsigned long, mpz_t)); -void sieve_region __GMP_PROTO ((unsigned char *, mpz_t, unsigned long)); -void make_primelist __GMP_PROTO ((unsigned long)); +void find_primes (unsigned char *, mpz_t, unsigned long, mpz_t); +void sieve_region ((unsigned char *, mpz_t, unsigned long); +void make_primelist (unsigned long); int flag_print = 1; int flag_count = 0; |