diff options
author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-29 15:46:06 +0000 |
---|---|---|
committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-29 15:46:06 +0000 |
commit | 4e14556c04921fb1ebdf00a4615670d88c09d148 (patch) | |
tree | feb15d83667ee00f1dd2a179d7e70610e3630b7f /xinit.c | |
parent | bb493442b65c30915eebd18eaa73c7229efe5b09 (diff) |
merge with XORG-RELEASE-1-TMCYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-MERGE
Diffstat (limited to 'xinit.c')
-rw-r--r-- | xinit.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -26,7 +26,6 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/xinit/xinit.c,v 3.32 2002/05/31 18:46:13 dawes Exp $ */ - #include <X11/Xlib.h> #include <X11/Xos.h> #include <stdio.h> @@ -123,6 +122,9 @@ char *server_names[] = { #ifdef XFREE86 "XFree86 XFree86 displays", #endif +#ifdef XORG + "Xorg X.Org displays", +#endif #ifdef __DARWIN__ "XDarwin Darwin/Mac OS X IOKit displays", "XDarwinQuartz Mac OS X Quartz displays", |