[m-dev.] for review: making bootstrap.h effectively empty

[Zoltan Somogyi]

The compiler now bootstraps with this change.

runtime/mercury_bootstrap.h:
	Make this file define nothing unless MR_EXTRA_BACKWARDS_COMPAT is
	defined. This should help keep our system namespace clean.

Zoltan.

Index: runtime/mercury_bootstrap.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_bootstrap.h,v
retrieving revision 1.20
diff -u -b -r1.20 mercury_bootstrap.h
--- runtime/mercury_bootstrap.h	2000/12/07 01:00:05	1.20
+++ runtime/mercury_bootstrap.h	2001/01/22 06:41:38
@@ -15,6 +15,13 @@
 #ifndef	MERCURY_BOOTSTRAP_H
 #define	MERCURY_BOOTSTRAP_H
 
+/*---------------------------------------------------------------------------*/
+/*
+** This stuff is not enabled by default.
+** To enable it, you must explicitly define MR_EXTRA_BACKWARDS_COMPAT.
+*/
+#ifdef	MR_EXTRA_BACKWARDS_COMPAT
+
 #define do_redo				MR_do_redo
 #define do_fail				MR_do_fail
 #define do_reset_hp_fail		MR_do_reset_hp_fail
@@ -223,16 +230,8 @@
 #define	virtual_reg(n)			MR_virtual_reg((n))
 #endif
 
-/*---------------------------------------------------------------------------*/
-/*
-** This stuff is enabled by default,
-** but you can disable it by defining MR_NO_BACKWARDS_COMPAT.
-*/
-
 #define MR_TypeCtorInfo_struct  MR_TypeCtorInfo_Struct
 
-#ifndef MR_NO_BACKWARDS_COMPAT
-
 #define	save_regs_to_mem(save_area)					\
 				MR_save_regs_to_mem(save_area)
 #define	restore_regs_from_mem(save_area) 				\
@@ -300,15 +299,6 @@
 #define	list_tail(l)		MR_list_tail(l)
 #define	list_empty()		MR_list_empty()
 #define	list_cons(h, t)		MR_list_cons((h), (t))
-
-#endif	/* MR_NO_BACKWARDS_COMPAT */
-
-/*---------------------------------------------------------------------------*/
-/*
-** This stuff is not enabled by default.
-** To enable it, you must explicitly define MR_EXTRA_BACKWARDS_COMPAT.
-*/
-#ifdef	MR_EXTRA_BACKWARDS_COMPAT
 
 #define succip			MR_succip
 #define hp			MR_hp
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------