[dotgnu-pnet-commits] [SCM] DotGNU Portable.NET engine, compilers and tools (pnet) branch, master, updated. 19fbd51c2c856085a35d59e66f343d34e96483b5

[Klaus Treichel]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "DotGNU Portable.NET engine, compilers and tools (pnet)".

The branch, master has been updated
       via  19fbd51c2c856085a35d59e66f343d34e96483b5 (commit)
      from  2aed9286bfa9bf349a639d7f51e9fd0a4449e43d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/pnet.git/commit/?id=19fbd51c2c856085a35d59e66f343d34e96483b5

commit 19fbd51c2c856085a35d59e66f343d34e96483b5
Author: Klaus Treichel <address@hidden>
Date:   Sun Nov 15 14:36:01 2009 +0100

    Fix the type for the socket lengths variables on non windows systems to be
    posix conformant.

diff --git a/ChangeLog b/ChangeLog
index d2703f3..6e1fcb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,17 @@
        -fno-inline-small-functions and -fno-inline-functions-called-once and
        add them to NO_INLINE_FUNCTIONS.
 
+       * support/socket.c (ILSysIOSockesAccept): Change sa_len to socklen_t on
+       non windows systems.
+       (ILSysIOSocketRecvFrom): likewise
+       (ILSysIOSocketGetName): likewise
+       (ILSysIOSocketGetOption): Change optlen to socklen_t on non windows
+       systems.
+       (ILSysIOSocketGetLinger): Change size to socklen_t on non windows
+       systems.
+       (ILSysIODiscoverIrDADevices): Change nativeLen to int on windows systems
+       and socklen_t otherwise.
+
 2009-11-08  Klaus Treichel  <address@hidden>
 
        * engine/engine.h: Centralize the declarations of METADATA_WRLOCK and
diff --git a/support/socket.c b/support/socket.c
index b3b12c5..e505b63 100644
--- a/support/socket.c
+++ b/support/socket.c
@@ -517,7 +517,11 @@ ILSysIOHandle ILSysIOSocketAccept(ILSysIOHandle sockfd, 
unsigned char *addr,
                                                                  ILInt32 
addrLen)
 {
        CombinedSockAddr sa_addr;
+#ifdef IL_WIN32_NATIVE
        int sa_len;
+#else
+       socklen_t sa_len;
+#endif
        int newfd;
 
        /* Accept the incoming connection */
@@ -587,7 +591,11 @@ ILInt32 ILSysIOSocketRecvFrom(ILSysIOHandle sockfd, void 
*buf,
                                                          unsigned char *addr, 
ILInt32 addrLen)
 {
        CombinedSockAddr sa_addr;
+#ifdef IL_WIN32_NATIVE
        int sa_len;
+#else
+       socklen_t sa_len;
+#endif
        int result;
 
        /* Receive the incoming data */
@@ -853,7 +861,11 @@ int ILSysIOSocketGetName(ILSysIOHandle sockfd, unsigned 
char *addr,
                                                 ILInt32 addrLen)
 {
        CombinedSockAddr sa_addr;
+#ifdef IL_WIN32_NATIVE
        int sa_len;
+#else
+       socklen_t sa_len;
+#endif
 
        /* Accept the incoming connection */
        sa_len = sizeof(CombinedSockAddr);
@@ -1102,10 +1114,11 @@ int ILSysIOSocketGetOption(ILSysIOHandle sockfd, 
ILInt32 level,
 {
 #ifdef HAVE_GETSOCKOPT
        ILInt32 nativeLevel, nativeName;
-       int optlen;
 #ifdef IL_WIN32_NATIVE
+       int optlen;
        ILInt32 optval;
 #else
+       socklen_t optlen;
        union
        {
                ILInt32 value;
@@ -1181,7 +1194,12 @@ int ILSysIOSocketGetLinger(ILSysIOHandle handle, int 
*enabled, int *seconds)
 {
 #if defined(HAVE_SETSOCKOPT) && defined(SO_LINGER)
        struct linger _linger;
-       int size=sizeof(struct linger);
+#ifdef IL_WIN32_NATIVE
+       int size;
+#else
+       socklen_t size;
+#endif
+       size=sizeof(struct linger);
        if(getsockopt((int)(ILNativeInt)handle, SOL_SOCKET, SO_LINGER,
                                  (void *)&(_linger), &size) != 0)
        {
@@ -1230,7 +1248,11 @@ int ILSysIODiscoverIrDADevices(ILSysIOHandle handle, 
unsigned char *buf,
        return 1;
 #elif defined(HAVE_GETSOCKOPT) && defined(IRLMP_ENUMDEVICES)
        char *nativeBuf;
-       ILInt32 nativeLen;
+#ifdef IL_WIN32_NATIVE
+       int nativeLen;
+#else
+       socklen_t nativeLen;
+#endif
        struct irda_device_list *list;
        int i;
        int index;

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

Summary of changes:
 ChangeLog        |   11 +++++++++++
 support/socket.c |   28 +++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
DotGNU Portable.NET engine, compilers and tools (pnet)