From 2e7986ae025903b95bff8f58088ed428409cccad Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 2 Oct 2014 11:50:34 +0200
Subject: Solved errors trying to listen on local

---
 include/dix-config.h             | 4 ++--
 xorg-server/hw/xwin/windisplay.c | 5 ++++-
 xorg-server/os/utils.c           | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/include/dix-config.h b/include/dix-config.h
index be2712693..11ebc2439 100755
--- a/include/dix-config.h
+++ b/include/dix-config.h
@@ -536,10 +536,10 @@
 #define LISTEN_TCP 1
 
 /* Listen on Unix socket */
-#define LISTEN_UNIX 1
+#undef LISTEN_UNIX
 
 /* Listen on local socket */
-#define LISTEN_LOCAL 1
+#undef LISTEN_LOCAL
 
 #include <X11/Xwinsock.h>
 #include <X11/Xwindows.h>
diff --git a/xorg-server/hw/xwin/windisplay.c b/xorg-server/hw/xwin/windisplay.c
index d92369850..fd6d4cd10 100644
--- a/xorg-server/hw/xwin/windisplay.c
+++ b/xorg-server/hw/xwin/windisplay.c
@@ -45,10 +45,13 @@
 void
 winGetDisplayName(char *szDisplay, unsigned int screen)
 {
+#ifdef LOCALCONN
     if (_XSERVTransIsListening("local")) {
         snprintf(szDisplay, 512, ":%s.%d", display, screen);
     }
-    else if (_XSERVTransIsListening("inet")) {
+    else
+#endif
+    if (_XSERVTransIsListening("inet")) {
         snprintf(szDisplay, 512, "127.0.0.1:%s.%d", display, screen);
     }
     else if (_XSERVTransIsListening("inet6")) {
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index 123baae85..bdb587e36 100755
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -670,10 +670,10 @@ static const char *defaultNoListenList[] = {
 #ifndef LISTEN_TCP
     "tcp",
 #endif
-#ifndef LISTEN_UNIX
+#if !defined(LISTEN_UNIX) && defined(UNIXCONN)
     "unix",
 #endif
-#ifndef LISTEN_LOCAL
+#if !defined(LISTEN_LOCAL) && defined(LOCALCONN)
     "local",
 #endif
     NULL
-- 
cgit v1.2.3