Final fixes to make the new directory structure work with MSVC++

src/Makefile.in

@@ -62,7 +62,7 @@ ecl/external.h: c/external.h
 	cp $(srcdir)/h/*.h ecl/
 	if grep 'undef ENABLE_DLOPEN' ecl/config.h; then cp c/external.h h; fi
 
-bin/ecl$(EXE): ecl_min$(EXE) compile.lsp sysfun.lsp ecl/external.h
+bin/ecl$(EXE): ecl_min$(EXE) compile.lsp sysfun.lsp ecl/external.h BUILD-STAMP
 	if [ -f CROSS-COMPILER ]; then \
 		./CROSS-COMPILER < compile.lsp; \
 	else \
@@ -116,7 +116,7 @@ rt.lisp:
 BUILD-STAMP: config.status
 	echo "#" `uname -a` > $@
 	head -8 config.log | tail -6 >> $@
-install: BUILD-STAMP install-base
+install: install-base
 	cd c; $(MAKE) prefix=$(prefix) DESTDIR=$(DESTDIR) install
 	cd doc; $(MAKE) prefix=$(prefix) DESTDIR=$(DESTDIR) install
 install-base:

src/c/alloc_2.d

@@ -18,8 +18,8 @@
 #include <ecl/ecl.h>
 #include <ecl/internal.h>
 #include <ecl/page.h>
-#include <ecl/gc/gc.h>
-#include <ecl/gc/private/gc_priv.h>
+#include <gc.h>
+#include <private/gc_priv.h>
 
 #ifdef GBC_BOEHM
 

src/c/file.d

@@ -1023,7 +1023,7 @@ BEGIN:
 #if defined(ECL_WSOCK)
 	case smm_io_wsock:
 	case smm_input_wsock: {
-		int fp = strm->stream.file;
+		int fp = (int)strm->stream.file;
 		if (!strm->stream.char_stream_p)
 			not_a_character_stream(strm);
 		if ( fp == INVALID_SOCKET )

src/c/main.d

@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <ecl/internal.h>
+extern int GC_dont_gc;
 
 /******************************* EXPORTS ******************************/
 

src/c/num_co.d

@@ -24,6 +24,9 @@
 #include <ecl/ecl.h>
 #include <float.h>
 #include <math.h>
+#ifdef _MSC_VER
+# undef complex
+#endif
 #ifndef HAVE_ISOC99
 # define floorf floor
 # define ceilf ceil

src/c/num_sfun.d

@@ -16,6 +16,9 @@
 
 #include <ecl/ecl.h>
 #include <math.h>
+#ifdef _MSC_VER
+# undef complex
+#endif
 #ifndef HAVE_ISOC99
 # define expf exp
 # define logf log

src/c/number.d

@@ -16,6 +16,9 @@
 
 #include <ecl/ecl.h>
 #include <math.h>
+#ifdef _MSC_VER
+# undef complex
+#endif
 #include <float.h>
 #include <ecl/internal.h>
 

src/c/print.d

@@ -19,6 +19,9 @@
 #include <stdlib.h>
 #include <float.h>
 #include <math.h>
+#ifdef _MSC_VER
+# undef complex
+#endif
 #include <ctype.h>
 #ifndef _MSC_VER
 #include <unistd.h>

src/c/read.d

@@ -18,6 +18,9 @@
 #include <limits.h>
 #include <float.h>
 #include <math.h>
+#ifdef _MSC_VER
+# undef complex
+#endif
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
@@ -25,6 +28,8 @@
 #include <ecl/ecl-inl.h>
 #include <ecl/bytecodes.h>
 
+#undef _complex
+
 #define	cat(rtbl,c)	((rtbl)->readtable.table[c].syntax_type)
 #define read_suppress (SYM_VAL(@'*read-suppress*') != Cnil)
 
@@ -384,7 +389,7 @@ parse_number(const char *s, cl_index end, cl_index *ep, int radix)
 #ifdef __GNUC__
 		char buffer[end+1];
 #else
-		char *buffer = cl_alloc_atomic(end+1);
+		char *buffer = (char*)cl_alloc_atomic(end+1);
 #endif
 		char *parse_end;
 		char exp_marker;

src/c/time.d

@@ -16,12 +16,15 @@
 
 #include <ecl/ecl.h>
 #include <math.h>
+#ifdef _MSC_VER
+# undef complex
+#endif
 #include <time.h>
 #ifdef HAVE_TIMES
-#include <sys/times.h>
+# include <sys/times.h>
 #endif
 #ifndef _MSC_VER
-#include <unistd.h>
+# include <unistd.h>
 #endif
 #include <ecl/internal.h>
 

src/lsp/config.lsp.in

@@ -68,11 +68,14 @@ Returns, as a string, the version of the software under which ECL runs."
 ;; * Set configuration pathnames. Notice the trailing slash!
 ;;   Otherwise it would not be a directory.
 ;;
-#-(and mingw32 msvc)
-(si::pathname-translations "SYS" '(("**;*.*" "@ecldir@/**/*.*")))
-#+(or mingw32 msvc)
-(si::pathname-translations "SYS"
-  `(("**;*.*" ,(merge-pathnames "**/*.*" (si::get-library-pathname)))))
+#-ecl-min
+(progn
+  #-(and mingw32 msvc)
+  (si::pathname-translations "SYS" '(("**;*.*" "@ecldir@/**/*.*")))
+  #+(or mingw32 msvc)
+  (si::pathname-translations "SYS"
+			     `(("**;*.*" ,(merge-pathnames "**/*.*" (si::get-library-pathname)))))
+);#-eclmin
 #-msvc
 (si::pathname-translations "HOME" '(("**;*.*" "~/**/*.*")))
 #+msvc