=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/main.c,v retrieving revision 1.7 retrieving revision 1.9 diff -u -p -r1.7 -r1.9 --- OpenXM_contrib2/asir2000/parse/main.c 2000/12/01 08:48:01 1.7 +++ OpenXM_contrib2/asir2000/parse/main.c 2000/12/22 10:03:32 1.9 @@ -45,13 +45,10 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.6 2000/11/14 08:38:40 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/main.c,v 1.8 2000/12/05 01:24:57 noro Exp $ */ #include "ca.h" #include "parse.h" -#if defined(THINK_C) -#include -#endif #if PARI #include "genpari.h" @@ -61,6 +58,17 @@ extern jmp_buf environnement; extern jmp_buf env; +#if defined(INTERVAL) +#ifndef ASIRRCNAME +#define ASIRRCNAME "int_asirrc" +#endif +#else +#ifndef ASIRRCNAME +#define ASIRRCNAME "asirrc" +#endif +#endif + + double get_current_time(); extern int mpi_nprocs,mpi_myid; @@ -132,15 +140,9 @@ char *argv[]; srandom((int)get_current_time()); /* mt_sgenrand((unsigned long)get_current_time()); */ -#if defined(THINK_C) - param_init(); -#endif rtime_init(); env_init(); endian_init(); -#if 0 && !defined(VISUAL) && !defined(THINK_C) - check_key(); -#endif GC_init(); process_args(--argc,++argv); #if PARI @@ -168,9 +170,6 @@ char *argv[]; if ( ptr = getenv("ASIR_CONFIG") ) strcpy(ifname,ptr); else { -#if defined(THINK_C) - sprintf(ifname,"asirrc"); -#else homedir = getenv("HOME"); if ( !homedir ) { char rootname[BUFSIZ]; @@ -178,8 +177,7 @@ char *argv[]; get_rootdir(rootname,sizeof(rootname)); homedir = rootname; } - sprintf(ifname,"%s/.asirrc",homedir); -#endif + sprintf(ifname,"%s/." ASIRRCNAME,homedir); } if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {