===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.14
retrieving revision 1.18
diff -u -p -r1.14 -r1.18
--- OpenXM_contrib2/asir2000/parse/glob.c	2001/03/08 07:49:13	1.14
+++ OpenXM_contrib2/asir2000/parse/glob.c	2001/06/04 02:49:48	1.18
@@ -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/glob.c,v 1.13 2000/12/22 10:03:31 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.17 2001/03/19 01:26:36 noro Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -94,7 +94,9 @@ FILE *ox_istream,*ox_ostream;
 int do_server_in_X11;
 Obj LastVal;
 char LastError[BUFSIZ];
+int timer_is_set;
 
+
 struct oV oVAR[] = {
 	{"x",0,0}, {"y",0,0}, {"z",0,0}, {"u",0,0},
 	{"v",0,0}, {"w",0,0}, {"p",0,0}, {"q",0,0},
@@ -130,7 +132,7 @@ F F_FALSE = &oF_FALSE;
 #if defined(__SVR4) && defined(sun)
 char cppname[BUFSIZ] = "/usr/ccs/lib/cpp ";
 #else
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__MACH__) && defined(__ppc__))
 char cppname[BUFSIZ] = "/usr/bin/cpp ";
 #else
 #if defined(VISUAL)
@@ -396,6 +398,9 @@ char *s;
 	/* restore states */
 	reset_engine();
 	reset_io();
+#if !defined(VISUAL)
+	reset_timer();
+#endif
 	longjmp(env,1);
 }
 
@@ -606,6 +611,10 @@ char *s;
 {
 	SNODE *snp;
 
+#if !defined(VISUAL)
+	if ( timer_is_set )
+		alrm_handler(SIGVTALRM);
+#endif
 	fprintf(stderr,"%s\n",s);
 	set_lasterror(s);
 	if ( CPVS != GPVS ) {
@@ -649,6 +658,7 @@ int interval;
 	it.it_value.tv_usec = 0;
 	setitimer(ITIMER_VIRTUAL,&it,0);
 	signal(SIGVTALRM,alrm_handler);
+	timer_is_set = 1;
 }
 
 void reset_timer()
@@ -661,6 +671,7 @@ void reset_timer()
 	it.it_value.tv_usec = 0;
 	setitimer(ITIMER_VIRTUAL,&it,0);
 	signal(SIGVTALRM,SIG_IGN);
+	timer_is_set = 0;
 }
 #endif
 
@@ -668,8 +679,13 @@ unsigned int get_asir_version();
 char *get_asir_distribution();
 
 void copyright() {
+#if defined(INTERVAL)
+	printf("This is Risa/Asir + Interval Arithmetic, Version %d (%s Distribution).\n",
+		get_asir_version(), get_asir_distribution());
+#else
 	printf("This is Risa/Asir, Version %d (%s Distribution).\n",
 		get_asir_version(), get_asir_distribution());
+#endif
 	printf("Copyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\n");
 	printf("Copyright 2000,2001, Risa/Asir committers, http://www.openxm.org/.\n");
 	printf("GC 5.3, copyright 1999, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n");