Use socklen_t where available.

Patch from <Pascal.Stumpf@cubes.de>

This should use socklen_t where available, really ...

diff --git a/cde/lib/tt/bin/ttdbserverd/db_server_svc.C b/cde/lib/tt/bin/ttdbserverd/db_server_svc.C
index dd6355b664af7a7008939c3b95f5dd46733f46d6..67b1ce0a1a64fb9183fc67afa40c39a31e4062a3 100644 (file)
--- a/cde/lib/tt/bin/ttdbserverd/db_server_svc.C
+++ b/cde/lib/tt/bin/ttdbserverd/db_server_svc.C
@@ -217,7 +217,7 @@ main(int argc, char** argv, char **envp)
 #if defined(DEC) || defined(sun) || defined(HPUX)
        int asize = sizeof(struct sockaddr);
 #else
-# if defined(linux)
+# if defined(linux) || defined(CSRG_BASED)
        socklen_t asize;
 # else
        size_t asize = sizeof(struct sockaddr);
@@ -484,7 +484,7 @@ main(int argc, char** argv, char **envp)
                if (!_tt_debug_mode) {
                        if (0!=fork()) exit(0);
 
-#ifdef __osf__
+#if defined(__osf__) || defined(CSRG_BASED)
                        setsid();
 #else
                        setpgrp();

diff --git a/cde/lib/tt/lib/mp/mp_stream_socket.C b/cde/lib/tt/lib/mp/mp_stream_socket.C
index f604f68e7112af61394707c9a44f338edd6825f1..fb2ba5af3f5e1bf011e73905d5ec2fd6be5f66a8 100644 (file)
--- a/cde/lib/tt/lib/mp/mp_stream_socket.C
+++ b/cde/lib/tt/lib/mp/mp_stream_socket.C
@@ -172,8 +172,12 @@ init(int init_as_source)
                            t_strerror( t_errno ) );
                return 0;
        }
+#else
+#if defined(linux) || defined(CSRG_BASED)
+       socklen_t       len;
 #else
        int             len;
+#endif
        int             optval;
        _sock = socket(AF_INET, SOCK_STREAM, 0);
        if (_sock < 0) {
@@ -439,7 +443,11 @@ accept()
 {
        if (_msgsock == -1) {
 #ifndef OPT_TLI
+#if defined(linux) || defined(CSRG_BASED)
+               socklen_t               addrlen = sizeof(sockaddr_in);
+#else
                int                     addrlen = sizeof(sockaddr_in);
+#endif
                sockaddr_in             saddr;
 
 #if defined(_AIX) && (OSMAJORVERSION==4) && (OSMINORVERSION==2)

diff --git a/cde/lib/tt/slib/mp_rpc_server.C b/cde/lib/tt/slib/mp_rpc_server.C
index 0b038cbe4f01e62f63ce8c6116954a4e407c7f5a..1ed95468c9600718eaf451d91672bd0389024ee3 100644 (file)
--- a/cde/lib/tt/slib/mp_rpc_server.C
+++ b/cde/lib/tt/slib/mp_rpc_server.C
@@ -355,7 +355,11 @@ gettransient(int proto, int vers, int *sockp)
 #ifndef OPT_TLI
        int                     found;
        int                     s;
+#if defined(linux) || defined(CSRG_BASED)
+       socklen_t               len;
+#else
        int                     len;
+#endif
        int                     socktype;
        sockaddr_in             addr;
        sockaddr_in             tport;