oops - the diff

[Thomas Charles CONWAY]

Oops. Too quick on the old CR key. Here's the diff:

-- 
Thomas Conway <conway at cs.mu.oz.au>
Nail here [] for new monitor.  )O+

cvs diff: Diffing .
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
Index: boehm_gc/gc.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/boehm_gc/gc.h,v
retrieving revision 1.21
diff -u -r1.21 gc.h
--- gc.h	1998/06/09 02:11:47	1.21
+++ gc.h	1998/06/09 05:11:03
@@ -666,7 +666,7 @@
 
 #if defined(SOLARIS_THREADS) || defined(IRIX_THREADS) || \
 	defined(LINUX_THREADS)
-extern void GC_thr_init();	/* Needed for Solaris/X86	*/
+extern void GC_thr_init(void);	/* Needed for Solaris/X86	*/
 #endif
 
 /*
Index: boehm_gc/linux_threads.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/boehm_gc/linux_threads.c,v
retrieving revision 1.1
diff -u -r1.1 linux_threads.c
--- linux_threads.c	1998/05/20 15:27:40	1.1
+++ linux_threads.c	1998/06/10 00:35:52
@@ -300,7 +300,7 @@
     return(p);
 }
 
-extern volatile int volatile_counter;
+volatile int volatile_counter;
 volatile int prev_counter;
 
 /* Caller holds allocation lock.	*/
Index: runtime/mercury_regorder.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_regorder.h,v
retrieving revision 1.5
diff -u -r1.5 mercury_regorder.h
--- mercury_regorder.h	1998/06/09 02:08:15	1.5
+++ mercury_regorder.h	1998/06/10 02:37:41
@@ -46,7 +46,7 @@
 #define r10		count_usage(R_RN(10), mr15)
 #define r11		count_usage(R_RN(11), mr16)
 #define r12		count_usage(R_RN(12), mr17)
-#define r13		count_usage(R_RN(13), mr19)
+#define r13		count_usage(R_RN(13), mr18)
 #define r14		count_usage(R_RN(14), mr19)
 #define r15		count_usage(R_RN(15), mr20)
 #define r16		count_usage(R_RN(16), mr21)
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/diff
cvs diff: Diffing scripts
Index: scripts/mgnuc.in
===================================================================
RCS file: /home/staff/zs/imp/mercury/scripts/mgnuc.in,v
retrieving revision 1.50
diff -u -r1.50 mgnuc.in
--- mgnuc.in	1998/06/09 02:16:25	1.50
+++ mgnuc.in	1998/06/09 05:10:00
@@ -260,7 +260,15 @@
 esac
 
 case $thread_safe in
-	true)		THREAD_OPTS="-DMR_THREAD_SAFE -DSOLARIS_THREADS -D_SOLARIS_PTHREADS -D_REENTRANT";;
+	true)
+	case $FULLARCH in
+		*solaris*) THREAD_OPTS="-DMR_THREAD_SAFE -DSOLARIS_THREADS \
+				-D_SOLARIS_PTHREADS -D_REENTRANT";;
+
+		*linux*) THREAD_OPTS="-DMR_THREAD_SAFE -DLINUX_THREADS";;
+
+		*)		THREAD_OPTS="" ;;
+	esac ;;
 	false)		THREAD_OPTS="" ;;
 esac