[MLton-commit] r4329

[Matthew Fluet]

Catching up with changes to basis-ffi.def
----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/runtime/Posix/ProcEnv/ProcEnv.c
U   mlton/branches/on-20050822-x86_64-branch/runtime/Posix/ProcEnv/getgroups.c
U   mlton/branches/on-20050822-x86_64-branch/runtime/Posix/TTY.c
U   mlton/branches/on-20050822-x86_64-branch/runtime/basis/IntInf.c
U   mlton/branches/on-20050822-x86_64-branch/runtime/basis/Net/NetHostDB.c
U   mlton/branches/on-20050822-x86_64-branch/runtime/gen/gen-types.c

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

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/Posix/ProcEnv/ProcEnv.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/Posix/ProcEnv/ProcEnv.c	2006-01-29 21:06:37 UTC (rev 4328)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/Posix/ProcEnv/ProcEnv.c	2006-01-29 21:18:38 UTC (rev 4329)
@@ -37,7 +37,7 @@
   return setgid (g);
 }
 
-C_Errno_t(C_Int_t) Posix_ProcEnv_setpgid (C_PId_t p, C_GId_t g) {
+C_Errno_t(C_Int_t) Posix_ProcEnv_setpgid (C_PId_t p, C_PId_t g) {
   return setpgid (p, g);
 }
 

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/Posix/ProcEnv/getgroups.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/Posix/ProcEnv/getgroups.c	2006-01-29 21:06:37 UTC (rev 4328)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/Posix/ProcEnv/getgroups.c	2006-01-29 21:18:38 UTC (rev 4329)
@@ -1,6 +1,6 @@
 #include "platform.h"
 
-C_Errno_t(C_Int_t) Posix_ProcEnv_getgroupsN (unit) {
+C_Errno_t(C_Int_t) Posix_ProcEnv_getgroupsN (void) {
   return getgroups (0, (gid_t*)NULL);
 }
 

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/Posix/TTY.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/Posix/TTY.c	2006-01-29 21:06:37 UTC (rev 4328)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/Posix/TTY.c	2006-01-29 21:18:38 UTC (rev 4329)
@@ -20,7 +20,7 @@
 
 void Posix_TTY_Termios_getCC (Array(C_CC_t) a) {
   for (int i = 0; i < NCCS; i++) 
-    ((cc_t*)a)[i] = termios.c_cc[n];
+    ((cc_t*)a)[i] = termios.c_cc[i];
 }
 
 C_Speed_t Posix_TTY_Termios_cfGetOSpeed (void) {
@@ -49,7 +49,7 @@
 
 void Posix_TTY_Termios_setCC (Array(C_CC_t) a) {
   for (int i = 0; i < NCCS; i++) 
-    termios.c_cc[n] = ((cc_t*)a)[i];
+    termios.c_cc[i] = ((cc_t*)a)[i];
 }
 
 C_Errno_t(C_Int_t) Posix_TTY_Termios_cfSetOSpeed (C_Speed_t s) {

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/basis/IntInf.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/basis/IntInf.c	2006-01-29 21:06:37 UTC (rev 4328)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/basis/IntInf.c	2006-01-29 21:18:38 UTC (rev 4329)
@@ -11,10 +11,6 @@
 #include "platform.h"
 typedef unsigned int uint;
 
-enum {
-  DEBUG_INT_INF = FALSE,
-};
-
 /* Import the global gcState so we can get and set the frontier. */
 extern struct GC_state gcState;
 

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/basis/Net/NetHostDB.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/basis/Net/NetHostDB.c	2006-01-29 21:06:37 UTC (rev 4328)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/basis/Net/NetHostDB.c	2006-01-29 21:18:38 UTC (rev 4329)
@@ -49,5 +49,5 @@
 }
 
 C_Errno_t(C_Int_t) NetHostDB_getHostName(Array(Char8_t) buf, C_Size_t len) {
-  gethostname ((char*)buf, len);
+  return gethostname ((char*)buf, len);
 }

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/gen/gen-types.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/gen/gen-types.c	2006-01-29 21:06:37 UTC (rev 4328)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/gen/gen-types.c	2006-01-29 21:18:38 UTC (rev 4329)
@@ -187,7 +187,7 @@
   writeString (cTypesHFd, "/* ");                   \
   writeString (cTypesHFd, #t);                      \
   writeString (cTypesHFd, " */ ");                  \
-  writeString (cTypesHFd, "Pointer_t ");            \
+  writeString (cTypesHFd, "Pointer ");              \
   writeString (cTypesHFd, "C_");                    \
   writeString (cTypesHFd, name);                    \
   writeString (cTypesHFd, "_t;");                   \