Skip to content
Snippets Groups Projects
Commit 174024e6 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

*** empty log message ***

parent b244bb89
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Common/GmshSocket.h
+ 6
− 7
View file @ 174024e6
...@@ -23,9 +23,13 @@ ...@@ -23,9 +23,13 @@
#include <sys/time.h> #include <sys/time.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.h> #include <netdb.h>
#if defined(HAVE_NO_SOCKLEN_T)
typedef int socklen_t;
#endif
#else #else
#include <winsock.h> #include <winsock.h>
#include <process.h> #include <process.h>
typedef int socklen_t;
#endif #endif
class GmshSocket{ class GmshSocket{
...@@ -369,15 +373,10 @@ class GmshServer : public GmshSocket{ ...@@ -369,15 +373,10 @@ class GmshServer : public GmshSocket{
} }
// accept connection request // accept connection request
#if defined(HAVE_NO_SOCKLEN_T)
int len;
#else
socklen_t len;
#endif
if(_portno < 0){ if(_portno < 0){
#if !defined(WIN32) || defined(__CYGWIN__) #if !defined(WIN32) || defined(__CYGWIN__)
struct sockaddr_un from_un; struct sockaddr_un from_un;
len = sizeof(from_un); socklen_t len = sizeof(from_un);
_sock = accept(tmpsock, (struct sockaddr *)&from_un, &len); _sock = accept(tmpsock, (struct sockaddr *)&from_un, &len);
#else #else
_sock = -7; // Unix sockets not available on Windows _sock = -7; // Unix sockets not available on Windows
...@@ -385,7 +384,7 @@ class GmshServer : public GmshSocket{ ...@@ -385,7 +384,7 @@ class GmshServer : public GmshSocket{
} }
else{ else{
struct sockaddr_in from_in; struct sockaddr_in from_in;
len = sizeof(from_in); socklen_t len = sizeof(from_in);
_sock = accept(tmpsock, (struct sockaddr *)&from_in, &len); _sock = accept(tmpsock, (struct sockaddr *)&from_in, &len);
} }
CloseSocket(tmpsock); CloseSocket(tmpsock);
......
utils/solvers/c++/GmshSocket.h
+ 6
− 7
View file @ 174024e6
...@@ -23,9 +23,13 @@ ...@@ -23,9 +23,13 @@
#include <sys/time.h> #include <sys/time.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.h> #include <netdb.h>
#if defined(HAVE_NO_SOCKLEN_T)
typedef int socklen_t;
#endif
#else #else
#include <winsock.h> #include <winsock.h>
#include <process.h> #include <process.h>
typedef int socklen_t;
#endif #endif
class GmshSocket{ class GmshSocket{
...@@ -369,15 +373,10 @@ class GmshServer : public GmshSocket{ ...@@ -369,15 +373,10 @@ class GmshServer : public GmshSocket{
} }
// accept connection request // accept connection request
#if defined(HAVE_NO_SOCKLEN_T)
int len;
#else
socklen_t len;
#endif
if(_portno < 0){ if(_portno < 0){
#if !defined(WIN32) || defined(__CYGWIN__) #if !defined(WIN32) || defined(__CYGWIN__)
struct sockaddr_un from_un; struct sockaddr_un from_un;
len = sizeof(from_un); socklen_t len = sizeof(from_un);
_sock = accept(tmpsock, (struct sockaddr *)&from_un, &len); _sock = accept(tmpsock, (struct sockaddr *)&from_un, &len);
#else #else
_sock = -7; // Unix sockets not available on Windows _sock = -7; // Unix sockets not available on Windows
...@@ -385,7 +384,7 @@ class GmshServer : public GmshSocket{ ...@@ -385,7 +384,7 @@ class GmshServer : public GmshSocket{
} }
else{ else{
struct sockaddr_in from_in; struct sockaddr_in from_in;
len = sizeof(from_in); socklen_t len = sizeof(from_in);
_sock = accept(tmpsock, (struct sockaddr *)&from_in, &len); _sock = accept(tmpsock, (struct sockaddr *)&from_in, &len);
} }
CloseSocket(tmpsock); CloseSocket(tmpsock);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment