[MLton-commit] r4625
Matthew Fluet
MLton@mlton.org
Wed, 31 May 2006 18:59:07 -0700
Cleaning up includes; sorry if I broke anything on other platforms
----------------------------------------------------------------------
U mlton/branches/on-20050822-x86_64-branch/runtime/Makefile
U mlton/branches/on-20050822-x86_64-branch/runtime/cenv.h
U mlton/branches/on-20050822-x86_64-branch/runtime/platform/aix.h
U mlton/branches/on-20050822-x86_64-branch/runtime/platform/cygwin.h
U mlton/branches/on-20050822-x86_64-branch/runtime/platform/darwin.h
U mlton/branches/on-20050822-x86_64-branch/runtime/platform/freebsd.h
U mlton/branches/on-20050822-x86_64-branch/runtime/platform/hpux.h
U mlton/branches/on-20050822-x86_64-branch/runtime/platform/linux.h
U mlton/branches/on-20050822-x86_64-branch/runtime/platform/mingw.h
U mlton/branches/on-20050822-x86_64-branch/runtime/platform/netbsd.h
U mlton/branches/on-20050822-x86_64-branch/runtime/platform/openbsd.h
U mlton/branches/on-20050822-x86_64-branch/runtime/platform/solaris.h
----------------------------------------------------------------------
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/Makefile
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/Makefile 2006-05-30 03:41:47 UTC (rev 4624)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/Makefile 2006-06-01 01:59:06 UTC (rev 4625)
@@ -174,6 +174,7 @@
platform.c
HFILES = \
+ cenv.h \
$(UTILHFILES) \
util.h \
$(GCHFILES) \
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/cenv.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/cenv.h 2006-05-30 03:41:47 UTC (rev 4624)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/cenv.h 2006-06-01 01:59:06 UTC (rev 4625)
@@ -29,7 +29,8 @@
// fenv.h (or approximate equivalent) comes from the n-way OS switch below.
// #include <fenv.h>
#include <float.h>
-#include <inttypes.h>
+// inttypes.h (or approximate equivalent) comes from the n-way OS switch below.
+// #include <inttypes.h>
#include <iso646.h>
#include <limits.h>
// #include <locale.h>
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform/aix.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform/aix.h 2006-05-30 03:41:47 UTC (rev 4624)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform/aix.h 2006-06-01 01:59:06 UTC (rev 4625)
@@ -1,19 +1,6 @@
-#define HAS_FEROUND TRUE
-#define HAS_FPCLASSIFY FALSE
-#define HAS_FPCLASSIFY64 TRUE
-#define HAS_MSG_DONTWAIT FALSE
-#define HAS_PTRACE FALSE
-#define HAS_REMAP FALSE
-#define HAS_SIGALTSTACK TRUE
-#define HAS_SIGNBIT FALSE
-#define HAS_SPAWN FALSE
-#define HAS_TIME_PROFILING FALSE
-
-#define MLton_Platform_OS_host "aix"
#define __ppc__
#include <grp.h>
-#include <math.h>
#include <netdb.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
@@ -25,12 +12,23 @@
#include <sys/syslog.h>
#include <sys/times.h>
#include <sys/types.h>
-#include <sys/types.h>
#include <sys/un.h>
#include <sys/utsname.h>
#include <termios.h>
+#define HAS_FEROUND TRUE
+#define HAS_FPCLASSIFY FALSE
+#define HAS_FPCLASSIFY64 TRUE
+#define HAS_MSG_DONTWAIT FALSE
+#define HAS_PTRACE FALSE
+#define HAS_REMAP FALSE
+#define HAS_SIGALTSTACK TRUE
+#define HAS_SIGNBIT FALSE
+#define HAS_SPAWN FALSE
+#define HAS_TIME_PROFILING FALSE
+#define MLton_Platform_OS_host "aix"
+
#include "feround.h"
#define FE_TOWARDZERO 0 // FP_RND_RZ
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform/cygwin.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform/cygwin.h 2006-05-30 03:41:47 UTC (rev 4624)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform/cygwin.h 2006-06-01 01:59:06 UTC (rev 4625)
@@ -1,11 +1,14 @@
+#include <inttypes.h>
+
#include <grp.h>
-#include <limits.h>
+#include <io.h>
#include <netdb.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <netinet/udp.h>
#include <process.h>
#include <pwd.h>
+#include <sys/cygwin.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/poll.h>
@@ -18,8 +21,6 @@
#include <syslog.h>
#include <termios.h>
#include <windows.h>
-#include <sys/cygwin.h>
-#include <io.h>
#define MLton_Platform_OS_host "cygwin"
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform/darwin.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform/darwin.h 2006-05-30 03:41:47 UTC (rev 4624)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform/darwin.h 2006-06-01 01:59:06 UTC (rev 4625)
@@ -1,8 +1,8 @@
#include <fenv.h>
+#include <inttypes.h>
#include <stdint.h>
#include <grp.h>
-#include <limits.h>
#include <netdb.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform/freebsd.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform/freebsd.h 2006-05-30 03:41:47 UTC (rev 4624)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform/freebsd.h 2006-06-01 01:59:06 UTC (rev 4625)
@@ -1,16 +1,14 @@
#include <fenv.h>
+#include <inttypes.h>
#include <stdint.h>
#include <grp.h>
-#include <limits.h>
#include <netdb.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <netinet/udp.h>
-#include <pwd.h>
#include <poll.h>
-#include <termios.h>
-#include <sys/resource.h>
+#include <pwd.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/poll.h>
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform/hpux.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform/hpux.h 2006-05-30 03:41:47 UTC (rev 4624)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform/hpux.h 2006-06-01 01:59:06 UTC (rev 4625)
@@ -3,8 +3,9 @@
#endif
#include <fenv.h>
+#include <inttypes.h>
+
#include <grp.h>
-#include <inttypes.h>
#include <math.h>
#include <netdb.h>
#include <netinet/in.h>
@@ -20,7 +21,6 @@
#include <sys/utsname.h>
#include <syslog.h>
#include <termios.h>
-#include <termios.h>
#include "setenv.h"
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform/linux.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform/linux.h 2006-05-30 03:41:47 UTC (rev 4624)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform/linux.h 2006-06-01 01:59:06 UTC (rev 4625)
@@ -1,29 +1,23 @@
#include <fenv.h>
+#include <inttypes.h>
#include <stdint.h>
#include <grp.h>
#include <netdb.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
-#include <netinet/udp.h>
-#include <pwd.h>
#include <poll.h>
-#include <termios.h>
-#include <sys/resource.h>
+#include <pwd.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
-#include <sys/poll.h>
-#include <sys/ptrace.h>
#include <sys/resource.h>
#include <sys/socket.h>
-#include <sys/sysinfo.h>
#include <sys/times.h>
#include <sys/un.h>
#include <sys/utsname.h>
#include <sys/wait.h>
#include <syslog.h>
#include <termios.h>
-#include <values.h>
#define HAS_FEROUND TRUE
#define HAS_FPCLASSIFY TRUE
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform/mingw.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform/mingw.h 2006-05-30 03:41:47 UTC (rev 4624)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform/mingw.h 2006-06-01 01:59:06 UTC (rev 4625)
@@ -1,9 +1,9 @@
#include <fenv.h>
+#include <inttypes.h>
#include <stdint.h>
#include <windows.h> // lots of stuff depends on this
#include <io.h>
-#include <limits.h>
#include <lm.h>
#include <process.h>
//#include <psapi.h>
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform/netbsd.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform/netbsd.h 2006-05-30 03:41:47 UTC (rev 4624)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform/netbsd.h 2006-06-01 01:59:06 UTC (rev 4625)
@@ -5,10 +5,8 @@
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <netinet/udp.h>
-#include <pwd.h>
#include <poll.h>
-#include <termios.h>
-#include <sys/resource.h>
+#include <pwd.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/param.h>
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform/openbsd.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform/openbsd.h 2006-05-30 03:41:47 UTC (rev 4624)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform/openbsd.h 2006-06-01 01:59:06 UTC (rev 4625)
@@ -1,13 +1,12 @@
-#include <grp.h>
#include <inttypes.h>
+
+#include <grp.h>
#include <netdb.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <netinet/udp.h>
-#include <pwd.h>
#include <poll.h>
-#include <termios.h>
-#include <sys/resource.h>
+#include <pwd.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/param.h>
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform/solaris.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform/solaris.h 2006-05-30 03:41:47 UTC (rev 4624)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform/solaris.h 2006-06-01 01:59:06 UTC (rev 4625)
@@ -1,3 +1,5 @@
+#include <inttypes.h>
+
#include <grp.h>
#include <netdb.h>
#include <netinet/in.h>
@@ -3,9 +5,7 @@
#include <netinet/tcp.h>
#include <netinet/udp.h>
+#include <poll.h>
#include <pwd.h>
#include <strings.h>
-#include <poll.h>
-#include <termios.h>
-#include <sys/resource.h>
#include <sys/filio.h> /* For FIONBIO, FIONREAD. */
#include <sys/ioctl.h>