[m-rev.] diff: fix Linux/Alpha boehm_gc compilation error

[Fergus Henderson]

Estimated hours taken: 1

Fix a compilation error on Linux/Alpha.

boehm_gc/include/private/gcconfig.h:
	Define ptr_t.  This is needed for the definition of GC_data_start, etc.

boehm_gc/include/private/gc_priv.h:
	Only define ptr_t if it is not already defined.

Workspace: /home/ceres/fjh/mercury
Index: boehm_gc/include/private/gc_priv.h
===================================================================
RCS file: /home/mercury1/repository/mercury/boehm_gc/include/private/gc_priv.h,v
retrieving revision 1.1.1.11
diff -u -d -r1.1.1.11 gc_priv.h
--- boehm_gc/include/private/gc_priv.h	25 Jul 2002 05:27:43 -0000	1.1.1.11
+++ boehm_gc/include/private/gc_priv.h	7 Sep 2002 19:01:08 -0000
@@ -57,10 +57,14 @@
 # define TRUE 1
 # define FALSE 0
 
-typedef char * ptr_t;	/* A generic pointer to which we can add	*/
-			/* byte displacements.				*/
-			/* Preferably identical to caddr_t, if it 	*/
-			/* exists.					*/
+/* ptr_t: A generic pointer to which we can add byte displacements.	*/
+/* Preferably identical to caddr_t, if it exists.			*/
+/* This definition is duplicated in gcconfig.h.				*/
+#ifndef GC_ptr_t_defined
+#define GC_ptr_t_defined
+typedef char *ptr_t;
+#endif
+
 			
 # ifndef GCCONFIG_H
 #   include "gcconfig.h"
Index: boehm_gc/include/private/gcconfig.h
===================================================================
RCS file: /home/mercury1/repository/mercury/boehm_gc/include/private/gcconfig.h,v
retrieving revision 1.6
diff -u -d -r1.6 gcconfig.h
--- boehm_gc/include/private/gcconfig.h	25 Jul 2002 09:03:20 -0000	1.6
+++ boehm_gc/include/private/gcconfig.h	7 Sep 2002 19:01:08 -0000
@@ -440,6 +440,14 @@
 		    /* 			(LINUX & MSWINCE)		*/
 
 
+/* ptr_t: A generic pointer to which we can add	byte displacements.	*/
+/* Preferably identical to caddr_t, if it exists.			*/
+/* This definition is duplicated in gc_priv.h.				*/
+#ifndef GC_ptr_t_defined
+#define GC_ptr_t_defined
+typedef char *ptr_t;
+#endif
+
 /*
  * For each architecture and OS, the following need to be defined:
  *

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------