mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-13 21:04:00 +00:00
Fix a couple of bugs where the macro USE_DLLs was referenced
Estimated hours taken: 0.5 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.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
/*
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user