diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-02 21:47:36 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-02 21:47:36 +0000 |
| commit | 0f5461311056a7bdcf1551ec532c7c7579bd5af8 (patch) | |
| tree | 388c091fe0ba54bba7da3b62d8e227c11616f65c /xinit.c | |
| parent | 71ad83f1bae8f357e8f40b7e7a0608e7ab22cc38 (diff) | |
70. Merging in the TM branch (Egbert Eich).xo-6_7_0XORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0XORG-RELEASE-1-STSFXORG-RELEASE-1
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", |