diff: a couple of bug fixes in runtime/

[Fergus Henderson]

runtime/mercury_table.c:
runtime/mercury_memory.c:
	Fix a couple of bugs where the macro USE_DLLs was referenced
	without having previously done "#include mercury_conf.h".

runtime/conf.h.in:
	Some minor improvements to the comments.

cvs diff: Diffing .
Index: mercury_conf.h.in
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_conf.h.in,v
retrieving revision 1.2
diff -u -u -r1.2 mercury_conf.h.in
--- mercury_conf.h.in	1997/11/23 07:21:15	1.2
+++ mercury_conf.h.in	1997/11/23 09:27:18
@@ -11,8 +11,11 @@
 */
 
 /*
-** Note -- this file must not contain any #include statements,
-** for reasons explained in imp.h.
+** IMPORTANT NOTE:
+** This file must not contain any #include statements,
+** and may not define any global variables,
+** for reasons explained in mercury_imp.h.
+** This file should contain _only_ configuration macros.
 */
 
 #ifndef MERCURY_CONF_H
Index: mercury_memory.c
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_memory.c,v
retrieving revision 1.2
diff -u -u -r1.2 mercury_memory.c
--- mercury_memory.c	1997/11/23 07:21:27	1.2
+++ mercury_memory.c	1997/11/23 09:28:15
@@ -29,11 +29,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-#ifdef USE_DLLS
-  #include "libmer_dll.h"
-#endif
-#include "mercury_regs.h"	/* must come first, due to global register vars */
-#include "mercury_conf.h"	/* must come second */
+#include "mercury_imp.h"
 
 #ifdef HAVE_SIGCONTEXT_STRUCT
   /*
Index: mercury_table.c
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_table.c,v
retrieving revision 1.2
diff -u -u -r1.2 mercury_table.c
--- mercury_table.c	1997/11/23 07:21:37	1.2
+++ mercury_table.c	1997/11/23 09:28:00
@@ -15,9 +15,7 @@
 
 #define	HASHDEBUG
 
-#ifdef USE_DLLS
-  #include	"libmer_dll.h"
-#endif
+#include	"mercury_imp.h" 
 
 #include	<stdio.h>
 #include	"mercury_std.h"
cvs diff: Diffing machdeps
-- 
Fergus Henderson <fjh at cs.mu.oz.au>   |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>   |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3         |     -- the last words of T. S. Garp.