From 174024e68c0c7acddeeda48bd007af1cf88f975c Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 25 Oct 2008 08:21:37 +0000
Subject: [PATCH] *** empty log message ***
---
Common/GmshSocket.h | 13 ++++++-------
utils/solvers/c++/GmshSocket.h | 13 ++++++-------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/Common/GmshSocket.h b/Common/GmshSocket.h
index 3495ebe9a8..6bfa40a1d3 100644
--- a/Common/GmshSocket.h
+++ b/Common/GmshSocket.h
@@ -23,9 +23,13 @@
#include <sys/time.h>
#include <netinet/in.h>
#include <netdb.h>
+#if defined(HAVE_NO_SOCKLEN_T)
+typedef int socklen_t;
+#endif
#else
#include <winsock.h>
#include <process.h>
+typedef int socklen_t;
#endif
class GmshSocket{
@@ -369,15 +373,10 @@ class GmshServer : public GmshSocket{
}
// accept connection request
-#if defined(HAVE_NO_SOCKLEN_T)
- int len;
-#else
- socklen_t len;
-#endif
if(_portno < 0){
#if !defined(WIN32) || defined(__CYGWIN__)
struct sockaddr_un from_un;
- len = sizeof(from_un);
+ socklen_t len = sizeof(from_un);
_sock = accept(tmpsock, (struct sockaddr *)&from_un, &len);
#else
_sock = -7; // Unix sockets not available on Windows
@@ -385,7 +384,7 @@ class GmshServer : public GmshSocket{
}
else{
struct sockaddr_in from_in;
- len = sizeof(from_in);
+ socklen_t len = sizeof(from_in);
_sock = accept(tmpsock, (struct sockaddr *)&from_in, &len);
}
CloseSocket(tmpsock);
diff --git a/utils/solvers/c++/GmshSocket.h b/utils/solvers/c++/GmshSocket.h
index 3495ebe9a8..6bfa40a1d3 100644
--- a/utils/solvers/c++/GmshSocket.h
+++ b/utils/solvers/c++/GmshSocket.h
@@ -23,9 +23,13 @@
#include <sys/time.h>
#include <netinet/in.h>
#include <netdb.h>
+#if defined(HAVE_NO_SOCKLEN_T)
+typedef int socklen_t;
+#endif
#else
#include <winsock.h>
#include <process.h>
+typedef int socklen_t;
#endif
class GmshSocket{
@@ -369,15 +373,10 @@ class GmshServer : public GmshSocket{
}
// accept connection request
-#if defined(HAVE_NO_SOCKLEN_T)
- int len;
-#else
- socklen_t len;
-#endif
if(_portno < 0){
#if !defined(WIN32) || defined(__CYGWIN__)
struct sockaddr_un from_un;
- len = sizeof(from_un);
+ socklen_t len = sizeof(from_un);
_sock = accept(tmpsock, (struct sockaddr *)&from_un, &len);
#else
_sock = -7; // Unix sockets not available on Windows
@@ -385,7 +384,7 @@ class GmshServer : public GmshSocket{
}
else{
struct sockaddr_in from_in;
- len = sizeof(from_in);
+ socklen_t len = sizeof(from_in);
_sock = accept(tmpsock, (struct sockaddr *)&from_in, &len);
}
CloseSocket(tmpsock);
--
GitLab