[m-rev.] diff: more MR_ prefix changes

[Simon Taylor]

Estimated hours taken: 0.25
Branches: main

More MR_ prefix changes.

runtime/mercury_conf_param.h:
	Remove support for the non-prefixed versions of the
	command line configuration parameters. Installations
	which use these are now considered to be too old by
	configure.in.

runtime/mercury_boostrap.h:
	Move everything into the section disabled by MR_NO_BACKWARDS_COMPAT.
	No definitions are required for bootstrapping at the moment.

runtime/Mmakefile:
trace/Mmakefile:
	Define MERCURY_BOOTSTRAP_H rather than MR_NO_BACKWARDS_COMPAT
	to suppress inclusion of backwards compatibility definitions.
	The runtime and trace sources shouldn't contain references
	to the definitions needed for bootstrapping.

trace/mercury_trace_internal.c:
deep_profiler/server.m:
	Add missing MR_ prefixes.

Index: deep_profiler/server.m
===================================================================
RCS file: /home/mercury1/repository/mercury/deep_profiler/server.m,v
retrieving revision 1.7
diff -u -u -r1.7 server.m
--- deep_profiler/server.m	18 Feb 2002 07:01:00 -0000	1.7
+++ deep_profiler/server.m	12 Mar 2002 08:23:39 -0000
@@ -133,7 +133,7 @@
 		** now to let the io__call_system in the cgi script succeed.
 		*/
 
-		extern	bool	MP_process_is_detached_server;
+		extern	MR_bool	MP_process_is_detached_server;
 
 		MP_process_is_detached_server = MR_TRUE;
 		exit(0);
Index: runtime/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/Mmakefile,v
retrieving revision 1.85
diff -u -u -r1.85 Mmakefile
--- runtime/Mmakefile	22 Feb 2002 07:02:28 -0000	1.85
+++ runtime/Mmakefile	12 Mar 2002 07:58:47 -0000
@@ -14,8 +14,7 @@
 
 #-----------------------------------------------------------------------------#
 
-CFLAGS		= -g $(DLL_CFLAGS) -DMR_NO_CONF_BACKWARDS_COMPAT \
-			-DMR_NO_BACKWARDS_COMPAT
+CFLAGS	= -g $(DLL_CFLAGS) -DMERCURY_BOOTSTRAP_H -DMERCURY_CONF_BOOTSTRAP_H
 
 MGNUC		= MERCURY_ALL_C_INCL_DIRS=" \
 			-I$(RUNTIME_DIR) \
Index: runtime/mercury_bootstrap.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_bootstrap.h,v
retrieving revision 1.26
diff -u -u -r1.26 mercury_bootstrap.h
--- runtime/mercury_bootstrap.h	20 Feb 2002 10:28:17 -0000	1.26
+++ runtime/mercury_bootstrap.h	12 Mar 2002 04:23:12 -0000
@@ -20,6 +20,13 @@
 */
 
 /*
+** This stuff is enabled by default,
+** but you can disable it by defining MR_NO_BACKWARDS_COMPAT.
+*/
+
+#ifndef MR_NO_BACKWARDS_COMPAT
+
+/*
 ** The next two #defines are needed for bootstrapping the new type constructor
 ** structure.
 */
@@ -53,13 +60,6 @@
 #ifndef FALSE
 #define FALSE			MR_FALSE
 #endif
-
-/*
-** This stuff is enabled by default,
-** but you can disable it by defining MR_NO_BACKWARDS_COMPAT.
-*/
-
-#ifndef MR_NO_BACKWARDS_COMPAT
 
 /* 
 ** For a long time the Mercury C types were defined as Char, Float,
Index: runtime/mercury_conf_param.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_conf_param.h,v
retrieving revision 1.55
diff -u -u -r1.55 mercury_conf_param.h
--- runtime/mercury_conf_param.h	5 Mar 2002 08:49:17 -0000	1.55
+++ runtime/mercury_conf_param.h	12 Mar 2002 04:23:12 -0000
@@ -117,75 +117,6 @@
 */
 
 /*
-** XXX Allow the non-prefixed versions of these macros to be used on
-** the command line until mgnuc and mercury_compile are fixed to
-** use the prefixed versions.
-*/
-#ifdef USE_GCC_GLOBAL_REGISTERS
-  #define MR_USE_GCC_GLOBAL_REGISTERS 1
-  #undef USE_GCC_GLOBAL_REGISTERS
-#endif
-#ifdef USE_GCC_NONLOCAL_GOTOS
-  #define MR_USE_GCC_NONLOCAL_GOTOS 1
-  #undef USE_GCC_NONLOCAL_GOTOS
-#endif
-#ifdef USE_ASM_LABELS
-  #define MR_USE_ASM_LABELS 1
-  #undef USE_ASM_LABELS
-#endif
-#ifdef CONSERVATIVE_GC
-  #define MR_CONSERVATIVE_GC 1
-  #undef CONSERVATIVE_GC
-#endif
-#ifdef NATIVE_GC
-  #define MR_NATIVE_GC 1
-  #undef NATIVE_GC
-#endif
-#ifdef NO_TYPE_LAYOUT
-  #define MR_NO_TYPE_LAYOUT 1
-  #undef NO_TYPE_LAYOUT
-#endif
-#ifdef BOXED_FLOAT
-  #define MR_BOXED_FLOAT 1
-  #undef BOXED_FLOAT
-#endif
-#ifdef USE_SINGLE_PREC_FLOAT
-  #define MR_USE_SINGLE_PREC_FLOAT 1
-  #undef USE_SINGLE_PREC_FLOAT
-#endif
-#ifdef SPLIT_C_FILES
-  #define MR_SPLIT_C_FILES 1
-  #undef SPLIT_C_FILES
-#endif
-#ifdef INLINE_ALLOC
-  #define MR_INLINE_ALLOC 1
-  #undef INLINE_ALLOC
-#endif
-#ifdef PIC_REG
-  #define MR_PIC_REG 1
-  #undef PIC_REG
-#endif
-#ifdef PIC
-  #if PIC == 0
-    #define MR_PIC 0
-  #else
-    #define MR_PIC 1
-  #endif
-  #undef PIC
-#endif
-#ifdef HIGHTAGS
-  #define MR_HIGHTAGS 1
-  #undef HIGHTAGS
-#endif
-#ifdef TAGBITS
-  #define MR_TAGBITS TAGBITS
-  /*
-  ** We can't #undef TAGBITS here because it is used in the
-  ** value of MR_TAGBITS.
-  */
-#endif
-
-/*
 ** Runtime checking options:
 **
 ** MR_CHECK_FOR_OVERFLOW
Index: trace/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/Mmakefile,v
retrieving revision 1.26
diff -u -u -r1.26 Mmakefile
--- trace/Mmakefile	6 Mar 2002 14:35:02 -0000	1.26
+++ trace/Mmakefile	12 Mar 2002 07:59:26 -0000
@@ -22,8 +22,7 @@
 			-I$(BOEHM_GC_DIR) \
 			-I$(BOEHM_GC_DIR)/include \
 		  "
-CFLAGS		= -g $(DLL_CFLAGS) -DMR_NO_CONF_BACKWARDS_COMPAT \
-				-DMR_NO_BACKWARDS_COMPAT
+CFLAGS	= -g $(DLL_CFLAGS) -DMERCURY_BOOTSTRAP_H -DMERCURY_CONF_BOOTSTRAP_H
 MGNUC		= $(M_ENV) $(SCRIPTS_DIR)/mgnuc
 MGNUCFLAGS	= --no-ansi
 
Index: trace/mercury_trace_internal.c
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/mercury_trace_internal.c,v
retrieving revision 1.122
diff -u -u -r1.122 mercury_trace_internal.c
--- trace/mercury_trace_internal.c	12 Mar 2002 03:40:42 -0000	1.122
+++ trace/mercury_trace_internal.c	12 Mar 2002 04:22:45 -0000
@@ -4302,7 +4302,7 @@
 	{ NULL, NULL, NULL, MR_trace_null_completer },
 };
 
-bool 
+MR_bool 
 MR_trace_command_completion_info(const char *word,
 	MR_Make_Completer *completer, const char *const **fixed_args)
 {
@@ -4310,11 +4310,11 @@
 
 	command_info = MR_trace_valid_command(word);
 	if (!command_info) {
-		return FALSE;
+		return MR_FALSE;
 	} else {
 		*completer = command_info->MR_trace_command_arg_completer;
 		*fixed_args = command_info->MR_trace_command_arg_strings;
-		return TRUE;
+		return MR_TRUE;
 	}
 }
 
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------