* demos/pexpr.c, demos/expr/expr.h, demos/expr/expr-impl.h: Use

	__GMP_PROTO.

2 files changed, 39 insertions, 39 deletions

diff --git a/demos/expr/expr-impl.h b/demos/expr/expr-impl.h
index 021f0b90c..9fa685c09 100644
--- a/demos/expr/expr-impl.h
+++ b/demos/expr/expr-impl.h
@@ -70,36 +70,36 @@ union mpX_t {
 typedef union mpX_t *mpX_ptr;
 typedef __gmp_const union mpX_t *mpX_srcptr;
 
-typedef void (*mpexpr_fun_one_t) _PROTO ((mpX_ptr));
-typedef unsigned long (*mpexpr_fun_ui_one_t) _PROTO ((mpX_ptr));
+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) _PROTO ((mpX_ptr));
-typedef int  (*mpexpr_fun_i_0ary_t) _PROTO ((void));
+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) _PROTO ((mpX_ptr, mpX_srcptr));
-typedef void (*mpexpr_fun_unary_ui_t) _PROTO ((mpX_ptr, unsigned long));
-typedef int  (*mpexpr_fun_i_unary_t) _PROTO ((mpX_srcptr));
-typedef int  (*mpexpr_fun_i_unary_ui_t) _PROTO ((unsigned long));
+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) _PROTO ((mpX_ptr, mpX_srcptr, mpX_srcptr));
-typedef void (*mpexpr_fun_binary_ui_t) _PROTO ((mpX_ptr, mpX_srcptr, unsigned long));
-typedef int  (*mpexpr_fun_i_binary_t) _PROTO ((mpX_srcptr, mpX_srcptr));
-typedef int  (*mpexpr_fun_i_binary_ui_t) _PROTO ((mpX_srcptr, 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)
-     _PROTO ((mpX_ptr, mpX_srcptr, mpX_srcptr, mpX_srcptr));
+     __GMP_PROTO ((mpX_ptr, mpX_srcptr, mpX_srcptr, mpX_srcptr));
 typedef void (*mpexpr_fun_ternary_ui_t)
-     _PROTO ((mpX_ptr, mpX_srcptr, mpX_srcptr, unsigned long));
+     __GMP_PROTO ((mpX_ptr, mpX_srcptr, mpX_srcptr, unsigned long));
 typedef int (*mpexpr_fun_i_ternary_t)
-     _PROTO ((mpX_srcptr, mpX_srcptr, mpX_srcptr));
+     __GMP_PROTO ((mpX_srcptr, mpX_srcptr, mpX_srcptr));
 typedef int (*mpexpr_fun_i_ternary_ui_t)
-     _PROTO ((mpX_srcptr, mpX_srcptr, unsigned long));
+     __GMP_PROTO ((mpX_srcptr, mpX_srcptr, unsigned long));
 
 typedef size_t (*mpexpr_fun_number_t)
-     _PROTO ((mpX_ptr, __gmp_const char *str, size_t len, int base));
-typedef void (*mpexpr_fun_swap_t) _PROTO ((mpX_ptr, mpX_ptr));
-typedef unsigned long (*mpexpr_fun_get_ui_t) _PROTO ((mpX_srcptr));
-typedef void (*mpexpr_fun_set_si_t) _PROTO ((mpX_srcptr, long));
+     __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));
 
 struct mpexpr_control_t {
   __gmp_const struct mpexpr_operator_t  *op;
@@ -144,7 +144,7 @@ struct mpexpr_parse_t {
 };
 
 
-int mpexpr_evaluate _PROTO ((struct mpexpr_parse_t *p));
-int mpexpr_va_to_var _PROTO ((void *var[], va_list ap));
-size_t mpexpr_mpz_number _PROTO ((mpz_ptr res,
+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));
diff --git a/demos/pexpr.c b/demos/pexpr.c
index 28692f8c7..9f3526afa 100644
--- a/demos/pexpr.c
+++ b/demos/pexpr.c
@@ -1,7 +1,7 @@
 /* Program for computing integer expressions using the GNU Multiple Precision
    Arithmetic Library.
 
-Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+Copyright 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -107,21 +107,21 @@ struct expr
 
 typedef struct expr *expr_t;
 
-void cleanup_and_exit _PROTO ((int));
-
-char *skipspace _PROTO ((char *));
-void makeexp _PROTO ((expr_t *, enum op_t, expr_t, expr_t));
-void free_expr _PROTO ((expr_t));
-char *expr _PROTO ((char *, expr_t *));
-char *term _PROTO ((char *, expr_t *));
-char *power _PROTO ((char *, expr_t *));
-char *factor _PROTO ((char *, expr_t *));
-int match _PROTO ((char *, char *));
-int matchp _PROTO ((char *, char *));
-int cputime _PROTO ((void));
-
-void mpz_eval_expr _PROTO ((mpz_ptr, expr_t));
-void mpz_eval_mod_expr _PROTO ((mpz_ptr, expr_t, mpz_ptr));
+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));
 
 char *error;
 int flag_print = 1;