[m-rev.] diff: fix hlc compilation errors

[Zoltan Somogyi]

runtime/mercury.h:
runtime/RESERVED_MACRO_NAMES:
	Extend the workaround for a module qualification bug that we use for
	the other builtin types to void and func.

Zoltan.

Index: mercury.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury.h,v
retrieving revision 1.45
diff -u -b -r1.45 mercury.h
--- mercury.h	2002/01/30 05:08:58	1.45
+++ mercury.h	2002/01/31 08:44:03
@@ -339,8 +339,12 @@
 	mercury__builtin__builtin__type_ctor_info_character_0
 #define mercury__builtin____type_ctor_info_pred_0 \
 	mercury__builtin__builtin__type_ctor_info_pred_0
+#define mercury__builtin____type_ctor_info_func_0 \
+	mercury__builtin__builtin__type_ctor_info_func_0
 #define mercury__builtin____type_ctor_info_tuple_0 \
 	mercury__builtin__builtin__type_ctor_info_tuple_0
+#define mercury__builtin____type_ctor_info_void_0 \
+	mercury__builtin__builtin__type_ctor_info_void_0
 
 /*
 ** The compiler used to generate references to this constant.
Index: RESERVED_MACRO_NAMES
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/RESERVED_MACRO_NAMES,v
retrieving revision 1.7
diff -u -b -r1.7 RESERVED_MACRO_NAMES
--- RESERVED_MACRO_NAMES	2002/01/30 14:51:07	1.7
+++ RESERVED_MACRO_NAMES	2002/01/31 10:42:10
@@ -142,10 +142,12 @@
 # The `mercury__' prefix is unique enough.
 mercury__builtin____type_ctor_info_character_0
 mercury__builtin____type_ctor_info_float_0
+mercury__builtin____type_ctor_info_func_0
 mercury__builtin____type_ctor_info_int_0
 mercury__builtin____type_ctor_info_pred_0
 mercury__builtin____type_ctor_info_string_0
 mercury__builtin____type_ctor_info_tuple_0
+mercury__builtin____type_ctor_info_void_0
 mercury__private_builtin__SIZEOF_WORD
 mercury__private_builtin__unsafe_type_cast_2_p_0
 #-----------------------------------------------------------------------------#
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------