From 99585120652f222a3016854e56884ed89c37de3c Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@gmail.com>
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(-)

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
 {
-- 
cgit v1.2.3


From 1a2bea98174d92164e2aefe35b70676a7b27eb33 Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@gmail.com>
Date: Wed, 29 Mar 2017 21:52:25 -0400
Subject: Remove EMX (MS-DOS & OS/2) support

---
 nxcomp/Loop.cpp  |  9 ---------
 nxcomp/Proxy.cpp | 10 ----------
 2 files changed, 19 deletions(-)

diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 70c5b4505..a3ea11009 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -102,15 +102,6 @@ typedef int socklen_t;
 // System specific defines.
 //
 
-#if defined(__EMX__)
-
-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 240d403a6..3a7a42362 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -49,16 +49,6 @@
 #include <netinet/tcp.h>
 #endif
 
-#if defined(__EMX__ )
-
-struct sockaddr_un
-{
-  u_short sun_family;
-  char sun_path[108];
-};
-
-#endif
-
 #include "NXalert.h"
 #include "NXvars.h"
 
-- 
cgit v1.2.3