aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/windisplay.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw/xwin/windisplay.c')
-rw-r--r--xorg-server/hw/xwin/windisplay.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/xorg-server/hw/xwin/windisplay.c b/xorg-server/hw/xwin/windisplay.c
index 17f0c7789..fd6d4cd10 100644
--- a/xorg-server/hw/xwin/windisplay.c
+++ b/xorg-server/hw/xwin/windisplay.c
@@ -45,18 +45,21 @@
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")) {
- snprintf(szDisplay, 512, "::1:%s.%d", display, screen);
+ snprintf(szDisplay, 512, "[::1]:%s.%d", display, screen);
}
else {
// this can't happen!
- ErrorF("winGetDisplay: Don't know what to use for DISPLAY\n");
+ winDebug("winGetDisplay: Don't know what to use for DISPLAY\n");
snprintf(szDisplay, 512, "localhost:%s.%d", display, screen);
}