diff options
author | Mike DePaulo <mikedep333@gmail.com> | 2017-03-29 07:19:25 -0400 |
---|---|---|
committer | Mike DePaulo <mikedep333@gmail.com> | 2017-03-29 07:19:25 -0400 |
commit | 99585120652f222a3016854e56884ed89c37de3c (patch) | |
tree | 804754e3b5ca392f209c4b5f7f95f337e6692a02 | |
parent | 342758254b1b8507c9ec774f40d8ec62baf394a8 (diff) | |
download | nx-libs-99585120652f222a3016854e56884ed89c37de3c.tar.gz nx-libs-99585120652f222a3016854e56884ed89c37de3c.tar.bz2 nx-libs-99585120652f222a3016854e56884ed89c37de3c.zip |
Cygwin nxcomp: Use Cygwin un.h
Cygwin has modified it over the years.
Fixes FTBFS #394
-rw-r--r-- | nxcomp/Loop.cpp | 3 | ||||
-rw-r--r-- | nxcomp/Proxy.cpp | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp index 3710b6414..70c5b4505 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,7 +102,7 @@ typedef int socklen_t; // System specific defines. // -#if defined(__EMX__) || defined(__CYGWIN32__) +#if defined(__EMX__) struct sockaddr_un { diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp index 123181489..240d403a6 100644 --- a/nxcomp/Proxy.cpp +++ b/nxcomp/Proxy.cpp @@ -43,17 +43,13 @@ #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__) +#if defined(__EMX__ ) struct sockaddr_un { |