[MLton-commit] r5511

[Matthew Fluet]

Regularize naming of auxilary function
----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/runtime/basis/Net/Socket/Socket.c
U   mlton/branches/on-20050822-x86_64-branch/runtime/platform/recv.nonblock.c
U   mlton/branches/on-20050822-x86_64-branch/runtime/platform.h

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

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/basis/Net/Socket/Socket.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/basis/Net/Socket/Socket.c	2007-04-11 20:38:39 UTC (rev 5510)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/basis/Net/Socket/Socket.c	2007-04-11 20:40:59 UTC (rev 5511)
@@ -36,7 +36,7 @@
 Socket_recv (C_Sock_t s, Array(Word8_t) msg, 
              C_Int_t start, C_Size_t len, C_Int_t flags) {
   MLton_initSockets ();
-  return mlton_recv (s, (void*)((char *)msg + start), len, flags);
+  return MLton_recv (s, (void*)((char *)msg + start), len, flags);
 }
 
 C_Errno_t(C_SSize_t) 
@@ -44,7 +44,7 @@
                  C_Int_t start, C_Size_t len, C_Int_t flags,
                  Array(Word8_t) addr, Ref(C_Socklen_t) addrlen) {
   MLton_initSockets ();
-  return mlton_recvfrom (s, (void*)((char *)msg + start), len, flags,
+  return MLton_recvfrom (s, (void*)((char *)msg + start), len, flags,
                          (struct sockaddr*)addr, (socklen_t*)addrlen);
 }
 

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform/recv.nonblock.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform/recv.nonblock.c	2007-04-11 20:38:39 UTC (rev 5510)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform/recv.nonblock.c	2007-04-11 20:40:59 UTC (rev 5511)
@@ -18,7 +18,7 @@
         fd_modify(fd, flags, 0, O_NONBLOCK);
 }
 
-int mlton_recv(int s, void *buf, int len, int flags)
+int MLton_recv(int s, void *buf, int len, int flags)
 {
         int ret;
         set_nonblock(s, flags);
@@ -27,7 +27,7 @@
         return ret;
 }
 
-int mlton_recvfrom(int s, void *buf, int len, int flags, void *from,
+int MLton_recvfrom(int s, void *buf, int len, int flags, void *from,
                    socklen_t *fromlen)
 {
         int ret;

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform.h	2007-04-11 20:38:39 UTC (rev 5510)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform.h	2007-04-11 20:40:59 UTC (rev 5511)
@@ -11,7 +11,8 @@
 
 #include "cenv.h"
 #include "util.h"
-#include "gc.h"
+#include "ml-types.h"
+#include "c-types.h"
 
 #ifndef MLton_Platform_Arch_host
 #error MLton_Platform_Arch_host not defined
@@ -109,13 +110,13 @@
 #endif
 #endif
 
-#include "ml-types.h"
-#include "c-types.h"
 #ifndef MLTON_CODEGEN_STATIC_INLINE
 #define MLTON_CODEGEN_STATIC_INLINE /*static inline*/
 #endif
 #include "basis-ffi.h"
 
+#include "gc.h"
+
 /* ---------------------------------------------------------------- */
 /*                        Runtime Init/Exit/Alloc                   */
 /* ---------------------------------------------------------------- */
@@ -200,14 +201,13 @@
 #endif
 
 #if HAS_MSG_DONTWAIT
-#define mlton_recv recv
-#define mlton_recvfrom recvfrom
+#define MLton_recv recv
+#define MLton_recvfrom recvfrom
 #else
 /* Platform has no MSG_DONTWAIT flag for recv(), so these must be
    defined to simulate that flag. */
-int mlton_recv(int s, void *buf, int len, int flags);
-int mlton_recvfrom(int s, void *buf, int len, int flags, void *from,
-                   socklen_t *fromlen);
+int MLton_recv(int s, void *buf, int len, int flags);
+int MLton_recvfrom(int s, void *buf, int len, int flags, void *from, socklen_t *fromlen);
 #endif
 
 #endif /* _MLTON_PLATFORM_H_ */