From f0059665b61bd6d2d6b57ee687039c4a581ec216 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 4 Jan 2006 21:53:10 +0000
Subject: [PATCH] fix post-install gc2.h include, no explicit load of
 msvcr71.dll

svn: r1762
---
 src/mred/mrmain.cxx           | 1 -
 src/mzscheme/include/scheme.h | 6 ++----
 src/mzscheme/main.c           | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/mred/mrmain.cxx b/src/mred/mrmain.cxx
index 68951c7209..faf05a2cbc 100644
--- a/src/mred/mrmain.cxx
+++ b/src/mred/mrmain.cxx
@@ -623,7 +623,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR ignored
   char *a, **argv, *b, *normalized_path = NULL;
 
   /* Order matters: load dependencies first */
-  load_delayed_dll("msvcr71.dll");
 # ifndef MZ_PRECISE_GC
   load_delayed_dll("libmzgcxxxxxxx.dll");
 # endif
diff --git a/src/mzscheme/include/scheme.h b/src/mzscheme/include/scheme.h
index 0a72a68dad..9588ac5768 100644
--- a/src/mzscheme/include/scheme.h
+++ b/src/mzscheme/include/scheme.h
@@ -1408,12 +1408,10 @@ void *scheme_malloc(size_t size);
 #  define GC2_EXTERN MZ_EXTERN
 # endif
 # ifdef INCLUDE_WITHOUT_PATHS
-#  if SCHEME_DIRECT_EMBEDDED
-#   include "gc2.h"
-#  else
+#  if !SCHEME_DIRECT_EMBEDDED
 #   define GC2_JUST_MACROS_AND_TYPEDEFS
-#   include "schemegc2.h"
 #  endif
+#  include "schemegc2.h"
 # else
 #  include "../gc2/gc2.h"
 # endif
diff --git a/src/mzscheme/main.c b/src/mzscheme/main.c
index 39f8ce163e..ecb2c76a57 100644
--- a/src/mzscheme/main.c
+++ b/src/mzscheme/main.c
@@ -238,7 +238,6 @@ int MAIN(int argc, MAIN_char **MAIN_argv)
 
 #ifdef DOS_FILE_SYSTEM
   /* Order matters: load dependencies first */
-  load_delayed_dll("msvcr71.dll");
 # ifndef MZ_PRECISE_GC
   load_delayed_dll("libmzgcxxxxxxx.dll");
 # endif