diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-08-21 13:07:41 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-08-21 13:07:41 -0700 |
| commit | 05541259bdb0dfaab015a01caa3722b7a1b782e2 (patch) | |
| tree | 601293b594050a1d30ae5fbca2ececb7fd7cc936 /os | |
| parent | c2535f67923bde0bfb0e72363467110806e2f40f (diff) | |
| parent | a1ac0440bba690368aa4226468ce571be1a09d95 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
Diffstat (limited to 'os')
| -rw-r--r-- | os/access.c | 4 | ||||
| -rw-r--r-- | os/utils.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/os/access.c b/os/access.c index 8e4bb7a49..cdb17589c 100644 --- a/os/access.c +++ b/os/access.c @@ -1188,7 +1188,11 @@ ResetHosts (char *display) FreeHost (host); } +#if defined WIN32 && defined __MINGW32__ +#define ETC_HOST_PREFIX "X" +#else #define ETC_HOST_PREFIX "/etc/X" +#endif #define ETC_HOST_SUFFIX ".hosts" fnamelen = strlen(ETC_HOST_PREFIX) + strlen(ETC_HOST_SUFFIX) + strlen(display) + 1; diff --git a/os/utils.c b/os/utils.c index b15700f85..31ae26a18 100644 --- a/os/utils.c +++ b/os/utils.c @@ -271,10 +271,6 @@ long Memory_fail = 0; #include <stdlib.h> /* for random() */ #endif -#ifdef sgi -int userdefinedfontpath = 0; -#endif /* sgi */ - char *dev_tty_from_init = NULL; /* since we need to parse it anyway */ OsSigHandlerPtr @@ -646,6 +642,7 @@ void UseMsg(void) ErrorF("v video blanking for screen-saver\n"); ErrorF("-v screen-saver without video blanking\n"); ErrorF("-wm WhenMapped default backing-store\n"); + ErrorF("-wr create root window with white background\n"); ErrorF("-x string loads named extension at init time \n"); ErrorF("-maxbigreqsize set maximal bigrequest size \n"); #ifdef PANORAMIX @@ -843,9 +840,6 @@ ProcessCommandLine(int argc, char *argv[]) { if(++i < argc) { -#ifdef sgi - userdefinedfontpath = 1; -#endif /* sgi */ defaultFontPath = argv[i]; } else @@ -990,6 +984,8 @@ ProcessCommandLine(int argc, char *argv[]) defaultScreenSaverBlanking = DontPreferBlanking; else if ( strcmp( argv[i], "-wm") == 0) defaultBackingStore = WhenMapped; + else if ( strcmp( argv[i], "-wr") == 0) + whiteRoot = TRUE; else if ( strcmp( argv[i], "-maxbigreqsize") == 0) { if(++i < argc) { long reqSizeArg = atol(argv[i]); |