aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-10-02 11:50:34 +0200
committermarha <marha@users.sourceforge.net>2014-10-02 11:50:57 +0200
commit2e7986ae025903b95bff8f58088ed428409cccad (patch)
tree5210934a66b8fe2d57b26330ed9dfa2e7ab23448 /xorg-server
parent59e93bef4b56a36f96a68376e2d8ceaadb892f96 (diff)
downloadvcxsrv-2e7986ae025903b95bff8f58088ed428409cccad.tar.gz
vcxsrv-2e7986ae025903b95bff8f58088ed428409cccad.tar.bz2
vcxsrv-2e7986ae025903b95bff8f58088ed428409cccad.zip
Solved errors trying to listen on local
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/hw/xwin/windisplay.c5
-rwxr-xr-xxorg-server/os/utils.c4
2 files changed, 6 insertions, 3 deletions
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