diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-03 20:39:06 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-03 20:39:06 +0200 |
| commit | 4e0e7c4727ca6b1125895a149dbb42d2e12b4a63 (patch) | |
| tree | e387cc881a8569f54d1c2c538e4b4718cd8e470e | |
| parent | 342758254b1b8507c9ec774f40d8ec62baf394a8 (diff) | |
| parent | 1a2bea98174d92164e2aefe35b70676a7b27eb33 (diff) | |
| download | nx-libs-4e0e7c4727ca6b1125895a149dbb42d2e12b4a63.tar.gz nx-libs-4e0e7c4727ca6b1125895a149dbb42d2e12b4a63.tar.bz2 nx-libs-4e0e7c4727ca6b1125895a149dbb42d2e12b4a63.zip | |
Merge branch 'mikedep333-pr/cygwin-nxcomp-ftbfs' into 3.6.x
Attributes GH PR #416: https://github.com/ArcticaProject/nx-libs/pull/416
| -rw-r--r-- | nxcomp/Loop.cpp | 10 | ||||
| -rw-r--r-- | nxcomp/Proxy.cpp | 14 |
2 files changed, 0 insertions, 24 deletions
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp index 3710b6414..a3ea11009 100644 --- a/nxcomp/Loop.cpp +++ b/nxcomp/Loop.cpp @@ -75,7 +75,6 @@ typedef int socklen_t; #ifndef __CYGWIN32__ #include <netinet/tcp.h> -#include <sys/un.h> #endif // @@ -103,15 +102,6 @@ typedef int socklen_t; // System specific defines. // -#if defined(__EMX__) || defined(__CYGWIN32__) - -struct sockaddr_un -{ - u_short sun_family; - char sun_path[108]; -}; - -#endif // // HP-UX hides this define. diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp index 123181489..3a7a42362 100644 --- a/nxcomp/Proxy.cpp +++ b/nxcomp/Proxy.cpp @@ -43,26 +43,12 @@ #include <netinet/in_systm.h> #endif -#ifndef __CYGWIN32__ -#include <sys/un.h> -#endif - #ifndef ANDROID #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/tcp.h> #endif -#if defined(__EMX__ ) || defined(__CYGWIN32__) - -struct sockaddr_un -{ - u_short sun_family; - char sun_path[108]; -}; - -#endif - #include "NXalert.h" #include "NXvars.h" |