aboutsummaryrefslogtreecommitdiff
path: root/apps/xhost/xhost.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-23 16:14:39 +0100
committermarha <marha@users.sourceforge.net>2012-01-23 16:15:11 +0100
commit0570a1c7385684374b77a5f62b84feb7fc7099be (patch)
treeff4f3c619be76a758b75fb5aa14546012cf76b70 /apps/xhost/xhost.c
parent7c71281dc91e15ef59ab3f4d5c11422a8cb7afdb (diff)
downloadvcxsrv-0570a1c7385684374b77a5f62b84feb7fc7099be.tar.gz
vcxsrv-0570a1c7385684374b77a5f62b84feb7fc7099be.tar.bz2
vcxsrv-0570a1c7385684374b77a5f62b84feb7fc7099be.zip
xhost now compiles
Diffstat (limited to 'apps/xhost/xhost.c')
-rw-r--r--apps/xhost/xhost.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/apps/xhost/xhost.c b/apps/xhost/xhost.c
index c7faeff6b..5724e945e 100644
--- a/apps/xhost/xhost.c
+++ b/apps/xhost/xhost.c
@@ -163,6 +163,16 @@ static volatile int nameserver_timedout;
static char *ProgramName;
+#ifdef WIN32
+#define alarm(arg)
+
+void sethostent(int x)
+{}
+
+void endhostent()
+{}
+#endif
+
#ifdef NEEDSOCKETS
static int
XFamily(int af)
@@ -791,7 +801,7 @@ get_hostname(XHostAddress *ha)
sa.sa_handler = nameserver_lost;
sa.sa_flags = 0; /* don't restart syscalls */
sigaction(SIGALRM, &sa, NULL);
-#else
+#elif !defined(WIN32)
signal(SIGALRM, nameserver_lost);
#endif
alarm(NAMESERVER_TIMEOUT);
@@ -969,12 +979,3 @@ local_xerror(Display *dpy, XErrorEvent *rep)
XmuPrintDefaultErrorMessage (dpy, rep, stderr);
return 0;
}
-
-#ifdef __CYGWIN__
-void sethostent(int x)
-{}
-
-void endhostent()
-{}
-#endif
-