diff: minor clpr changes

[Fergus Henderson]

clpr/clpr/lib.c:
	Use `int' or `pid_t' rather than `CLPR_int' in a few places
	where the global replace of s/int/CLPR_int/g had been a bit
	over-enthusiastic.

clpr/clpr/README.Mercury:
	Document some of the previous changes better.

cvs diff: Diffing .
cvs diff: .cvsignore is a new entry, no comparison available
Index: README.Mercury
===================================================================
RCS file: /home/staff/zs/imp/clpr/clpr/README.Mercury,v
retrieving revision 1.2
diff -u -u -r1.2 README.Mercury
--- README.Mercury	1997/09/04 21:37:36	1.2
+++ README.Mercury	1997/09/15 09:06:58
@@ -4,7 +4,10 @@
 *.[hc]:
 	Prefix certain symbols with `CLPR_' to avoid name clashes
 	with symbols of the same name defined by the Mercury runtime
-	engine.
+	engine. 
+	Use function prototypes.  Add some new header files.
+	Use `%p' rather than `%x' to print pointers.
+	Avoid assuming that ints are 32-bit.
 
 debug.c:
 	Fix a bug: the output was coming out in the wrong order,
@@ -26,7 +29,7 @@
 	from the sources in our repository.
 
 Makefile:
-	Minor changes to deal with the new .c files.
+	Minor changes to deal with the new .c and .h files.
 
 Mmake:
 	New file to build libclpr.a for use by Mercury.
Index: lib.c
===================================================================
RCS file: /home/staff/zs/imp/clpr/clpr/lib.c,v
retrieving revision 1.9
diff -u -u -r1.9 lib.c
--- lib.c	1997/09/15 08:26:44	1.9
+++ lib.c	1997/09/15 09:11:10
@@ -1241,9 +1241,9 @@
 CLPR_int do_oracle(CLPR_int *t1, CLPR_int *t2, CLPR_int *t3)
 {
 char *s, *p1, *p2;
-CLPR_int fildes1[2];
-CLPR_int fildes2[2];
-CLPR_int p_pid;
+int fildes1[2];
+int fildes2[2];
+pid_t p_pid;
 IO_REC *tt;
 	t1 = findbind(t1);
 	if (!is_con(t1)) {
@@ -1309,7 +1309,7 @@
 CLPR_int do_pipe(CLPR_int *t)
 {
 char *s;
-CLPR_int fildes[2];
+int fildes[2];
 IO_REC *tt;
 	t = findbind(t);
 	if (!is_con(t)) runtime_error("bad argument to pipe/1");
-- 
Fergus Henderson <fjh at cs.mu.oz.au>   |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>   |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3         |     -- the last words of T. S. Garp.