Export ECL_THREADS configuration flag when processing msvc/ecl/config.h.msvc6

msvc/Makefile

@@ -102,7 +102,7 @@ LDFLAGS	= /link /nologo /nodefaultlib:libcmt /nodefaultlib:libcmtd /nodefaultlib
 ENV_EXPORT = cl_env,DATA
 !else
 ENV_EXPORT = ecl_process_env
-CFLAGS     = $(CFLAGS) /DECL_THREADS
+CFLAGS     = $(CFLAGS)
 DEF        = ecl-threads.def
 !endif
 

msvc/c/Makefile

@@ -5,9 +5,11 @@ top_srcdir = ..\..\src
 srcdir	= ..\..\src\c
 
 !if "$(ECL_THREADS)" != ""
+ECL_THREADS_FLAG=1
 THREADS_OBJ= threads.obj
 THREADS_FLAGS= -DECL_THREADS
 !else
+ECL_THREADS_FLAG=0
 THREADS_OBJ=
 THREADS_FLAGS=
 !endif
@@ -100,6 +102,7 @@ $(DPP): $(srcdir)/dpp.c $(srcdir)/symbols_list2.h ../ecl/config.h
 	for %i in ($(HFILES)) do $(CP) %i ..\ecl
 	cut.exe "@ECL_FPE_CODE@" "$(srcdir:\=/)/arch/fpe_x86.c" \
 		"@ECL_VERSION_NUMBER@" "$(ECL_VERSION_NUMBER)" \
+		"@ECL_THREADS@" "$(ECL_THREADS_FLAG)" \
 	        < ..\ecl\config.h.msvc6 > $@
 
 #

msvc/ecl/config.h.msvc6

@@ -58,9 +58,11 @@
 #include <ecl/gmp.h>
 
 /* Userland threads?							*/
-/* #undef ECL_THREADS */
-#ifdef ECL_THREADS
+#define ECL_THREADS @ECL_THREADS@
+#if ECL_THREADS
 # define GC_WIN32_THREADS
+#else
+# undef ECL_THREADS
 #endif
 
 /* __thread thread-local variables?                                     */