From 99585120652f222a3016854e56884ed89c37de3c Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Wed, 29 Mar 2017 07:19:25 -0400 Subject: Cygwin nxcomp: Use Cygwin un.h Cygwin has modified it over the years. Fixes FTBFS #394 --- nxcomp/Loop.cpp | 3 +-- nxcomp/Proxy.cpp | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'nxcomp') 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 -#include #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 #endif -#ifndef __CYGWIN32__ -#include -#endif - #ifndef ANDROID #include #include #include #endif -#if defined(__EMX__ ) || defined(__CYGWIN32__) +#if defined(__EMX__ ) struct sockaddr_un { -- cgit v1.2.3