=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/asir_lib.c,v retrieving revision 1.2 retrieving revision 1.7 diff -u -p -r1.2 -r1.7 --- OpenXM_contrib2/asir2000/parse/asir_lib.c 2000/08/21 08:31:45 1.2 +++ OpenXM_contrib2/asir2000/parse/asir_lib.c 2004/02/13 05:48:36 1.7 @@ -23,7 +23,7 @@ * shall be made on your publication or presentation in any form of the * results obtained by use of the SOFTWARE. * (4) In the event that you modify the SOFTWARE, you shall notify FLL by - * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification * for such modification or the source code of the modified part of the * SOFTWARE. * @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/parse/asir_lib.c,v 1.1.1.1 1999/12/03 07:39:11 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/asir_lib.c,v 1.6 2003/02/14 22:29:17 ohara Exp $ */ #include "ca.h" #include "parse.h" @@ -53,14 +53,14 @@ #include #endif -#if PARI -#include "genpari.h" - +#if defined(PARI) +# include "genpari.h" +# if !(PARI_VERSION_CODE > 131588 ) extern jmp_buf environnement; +# endif #endif extern jmp_buf env; -extern int *StackBottom; extern char *parse_strp; extern int do_file; @@ -69,7 +69,6 @@ int Call_Asir(char *,pointer *); void Init_Asir(int argc,char **argv) { - int tmp; FILE *ifp; char ifname[BUFSIZ]; extern int GC_dont_gc; @@ -82,7 +81,7 @@ void Init_Asir(int argc,char **argv) return; asirlib_initialized = 1; do_file = 1; -#if PARI +#if defined(PARI) risa_pari_init(); #endif srandom((int)get_current_time()); @@ -91,7 +90,6 @@ void Init_Asir(int argc,char **argv) #if defined(THINK_C) param_init(); #endif - StackBottom = &tmp + 1; /* XXX */ rtime_init(); env_init(); endian_init(); @@ -136,12 +134,16 @@ int Call_Asir(char *cmd,pointer *result) { SNODE snode; pointer val; -#if PARI +#if defined(PARI) + void recover(int); + recover(0); +# if !(PARI_VERSION_CODE > 131588) if ( setjmp(environnement) ) { avma = top; recover(1); error("PARI error"); } +# endif #endif if ( setjmp(env) ) { *result = 0;