Skip to content

N
nx-libs
Commit 4e0e7c47 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge branch 'mikedep333-pr/cygwin-nxcomp-ftbfs' into 3.6.x

Attributes GH PR #416: https://github.com/ArcticaProject/nx-libs/pull/416
parents 34275825 1a2bea98
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 24 deletions
nxcomp/Loop.cpp
View file @ 4e0e7c47
......@@ -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.
......
nxcomp/Proxy.cpp
View file @ 4e0e7c47
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment