[m-dev.] diff: include MR_NEW_MERCURYFILE_STRUCT in mangled grade

[Fergus Henderson]

Estimated hours taken: 0.5

runtime/mercury_grade.h:
	Include `_file' in the mangled grade name if
	MR_NEW_MERCURYFILE_STRUCT is set.  This is needed since
	MR_NEW_MERCURYFILE_STRUCT affects binary compatibility.

Workspace: /home/pgrad/fjh/ws/hg
Index: runtime/mercury_grade.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_grade.h,v
retrieving revision 1.28
diff -u -d -r1.28 mercury_grade.h
--- runtime/mercury_grade.h	2000/10/13 05:47:29	1.28
+++ runtime/mercury_grade.h	2000/10/23 13:41:18
@@ -178,7 +178,11 @@
   #define MR_GRADE_PART_9	MR_PASTE2(MR_GRADE_PART_8, _ubf)
 #endif
 
-#define MR_GRADE_PART_10	MR_GRADE_PART_9
+#ifdef MR_NEW_MERCURYFILE_STRUCT
+  #define MR_GRADE_PART_10	MR_PASTE2(MR_GRADE_PART_9, _file)
+#else
+  #define MR_GRADE_PART_10	MR_GRADE_PART_9
+#endif
 
 #if defined(PIC_REG) && defined(USE_GCC_GLOBAL_REGISTERS) && defined(__i386__)
   #define MR_GRADE_PART_11	MR_PASTE2(MR_GRADE_PART_10, _picreg)
@@ -322,9 +326,14 @@
 #endif
 
 /*
-** Parts 8-10 above (i.e. tag bits, and (un)boxed float)
+** Parts 8-9 above (i.e. tag bits, and (un)boxed float)
 ** are documented as "not for general use", and can't be set via the
 ** `--grade' option; we don't bother to pass them on.
+**
+** Likewise part 10 above (i.e. MR_NEW_MERCURYFILE_STRUCT)
+** can't be set by the `--grade' option; it's intended to be
+** set by the configure script at configuration time.
+** So we don't bother to pass it on.
 */
 
 #if defined(PIC_REG) && defined(USE_GCC_GLOBAL_REGISTERS) && defined(__i386__)

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------