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 dd6355b..67b1ce0 100644
--- 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 f604f68..fb2ba5a 100644
--- a/cde/lib/tt/lib/mp/mp_stream_socket.C
+++ b/cde/lib/tt/lib/mp/mp_stream_socket.C
@@ -173,7 +173,11 @@ init(int init_as_source)
                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 0b038cb..1ed9546 100644
--- 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;

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Reply via email to