[MLton-commit] r4901

[Matthew F. <fl...@ml...>]

Fix typo in runtime/platform/windows.c.
Clean up .exe files in 'make runtime'.

----------------------------------------------------------------------

U   mlton/trunk/runtime/Makefile
U   mlton/trunk/runtime/platform/windows.c

----------------------------------------------------------------------

Modified: mlton/trunk/runtime/Makefile
===================================================================
--- mlton/trunk/runtime/Makefile	2006-12-02 19:37:45 UTC (rev 4900)
+++ mlton/trunk/runtime/Makefile	2006-12-02 22:27:58 UTC (rev 4901)
@@ -20,6 +20,7 @@
 GCC_VERSION := $(GCC_MAJOR_VERSION).$(GCC_MINOR_VERSION)
 
 FLAGS := 
+EXE :=
 OPTFLAGS := -O2 -fomit-frame-pointer
 GCOPTFLAGS := 
 DEBUGFLAGS := 
@@ -66,6 +67,10 @@
 DEBUGFLAGS += -gstabs+
 endif
 
+ifeq ($(TARGET_OS), cygwin)
+EXE := .exe
+endif
+
 ifeq ($(TARGET_OS), darwin)
 FLAGS += -I/sw/include -I/opt/local/include
 endif
@@ -74,6 +79,10 @@
 FLAGS += -I/usr/local/include
 endif
 
+ifeq ($(TARGET_OS), mingw)
+EXE := .exe
+endif
+
 ifeq ($(TARGET_OS), netbsd)
 FLAGS += -I/usr/pkg/include
 endif
@@ -265,7 +274,7 @@
 	$(CC) $(OPTCFLAGS) $(WARNCFLAGS) -o gen/gen-types gen/gen-types.c util.o
 	rm -f gen/c-types.h gen/c-types.sml gen/ml-types.h
 	cd gen && ./gen-types
-	rm -f gen/gen-types
+	rm -f gen/gen-types$(EXE)
 
 c-types.h ml-types.h: gen/c-types.h gen/ml-types.h
 	rm -f c-types.h ml-types.h
@@ -286,7 +295,7 @@
 	$(CC) $(OPTCFLAGS) $(WARNCFLAGS) -o bytecode/print-opcodes bytecode/print-opcodes.c
 	rm -f bytecode/opcodes
 	cd bytecode && ./print-opcodes > opcodes
-	rm -f bytecode/print-opcodes
+	rm -f bytecode/print-opcodes$(EXE)
 
 
 util-gdb.o: util.c $(UTILCFILES) cenv.h $(UTILHFILES)
@@ -345,6 +354,7 @@
 	echo GCC_MINOR_VERSION = $(GCC_MINOR_VERSION)
 	echo GCC_VERSION = $(GCC_VERSION)
 	echo FLAGS = $(FLAGS)
+	echo EXE = $(EXE)
 	echo OPTFLAGS = $(OPTFLAGS)
 	echo GCOPTFLAGS = $(GCOPTFLAGS)
 	echo DEBUGFLAGS = $(DEBUGFLAGS)

Modified: mlton/trunk/runtime/platform/windows.c
===================================================================
--- mlton/trunk/runtime/platform/windows.c	2006-12-02 19:37:45 UTC (rev 4900)
+++ mlton/trunk/runtime/platform/windows.c	2006-12-02 22:27:58 UTC (rev 4901)
@@ -1,4 +1,4 @@
-iHANDLE fileDesHandle (int fd);
+HANDLE fileDesHandle (int fd);
 
 #define BUFSIZE 65536