[m-rev.] diff: apply some fixes to release branch

[Fergus Henderson]

Estimated hours taken: 0.5
Branches: release

Apply some bug fixes to the release branch. So far, these fixes
had only been committed on the main branch.

runtime/mercury_stack_layout.h:
	Fix a bug: add a missing #include.

runtime/mercury_type_info.h:
	Fix a bug: s/union MR_TrieNode/MR_TrieNode/
	This is needed since MR_TrieNode is a typedef, not a union.

Workspace: /home/ceres/fjh/mercury
Index: runtime/mercury_stack_layout.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_stack_layout.h,v
retrieving revision 1.64.2.2
diff -u -d -r1.64.2.2 mercury_stack_layout.h
--- runtime/mercury_stack_layout.h	26 Feb 2003 08:07:43 -0000	1.64.2.2
+++ runtime/mercury_stack_layout.h	20 Aug 2003 06:24:29 -0000
@@ -33,6 +33,8 @@
 #include "mercury_std.h"			/* for MR_VARIABLE_SIZED */
 #include "mercury_tags.h"
 #include "mercury_type_info.h"			/* for MR_PseudoTypeInfo */
+#include "mercury_tabling.h"			/* for MR_TableNodeUnion,
+					           needed for MR_TrieNode */
 
 /*-------------------------------------------------------------------------*/
 /*
Index: runtime/mercury_type_info.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_type_info.h,v
retrieving revision 1.96.2.2
diff -u -d -r1.96.2.2 mercury_type_info.h
--- runtime/mercury_type_info.h	5 Aug 2003 10:48:53 -0000	1.96.2.2
+++ runtime/mercury_type_info.h	20 Aug 2003 06:25:41 -0000
@@ -102,7 +102,7 @@
 typedef       struct MR_TypeInfo_Almost_Struct          *MR_TypeInfo;
 typedef const struct MR_PseudoTypeInfo_Almost_Struct    *MR_PseudoTypeInfo;
 typedef const void                                      *MR_ReservedAddr;
-typedef union MR_TrieNode                               *MR_TrieNodePtr;
+typedef MR_TrieNode                                     *MR_TrieNodePtr;
 
 #ifdef  MR_HIGHLEVEL_CODE
   typedef MR_Box                                        MR_BaseTypeclassInfo;

-- 
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
--------------------------------------------------------------------------