diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-07-17 18:34:19 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-07-17 21:18:06 -0700 |
| commit | a74131c41c63cbe5861b9550dfa7a921ec601c87 (patch) | |
| tree | f4d6a9b12788f01a05b1f19ced35958d61806e96 | |
| parent | 8463017f7de43fe0a8ec144faca6bbf43168ebf9 (diff) | |
Remove OS/2's duplicate copy of default path definitions in resource.c
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | resource.c | 58 |
1 files changed, 0 insertions, 58 deletions
@@ -80,7 +80,6 @@ int choiceTimeout; /* chooser choice timeout */ * parameters set util/imake.includes/site.def (or *.macros in that directory * if it is server-specific). DO NOT CHANGE THESE DEFINITIONS! */ -#ifndef __EMX__ #ifndef DEF_SERVER_LINE #define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0" #endif @@ -143,63 +142,6 @@ int choiceTimeout; /* chooser choice timeout */ #ifndef DEF_GREETER_LIB #define DEF_GREETER_LIB "/usr/lib/X11/xdm/libXdmGreet.so" #endif -#else -/* unfortunately I have to declare all of them, because there is a limit - * in argument size in OS/2 - * but everything needs to be fixed again - */ -#define DEF_SERVER_LINE ":0 local /XFree86/bin/X :0" -#ifndef XRDB_PROGRAM -#define XRDB_PROGRAM "/XFree86/bin/xrdb" -#endif -#ifndef DEF_SESSION -#define DEF_SESSION "/XFree86/bin/xterm -ls" -#endif -#ifndef DEF_USER_PATH -#define DEF_USER_PATH "c:\\os2;c:\\os2\apps;\\XFree86\\bin" -#endif -#ifndef DEF_SYSTEM_PATH -#define DEF_SYSTEM_PATH "c:\\os2;c:\\os2\apps;\\XFree86\\bin" -#endif -#ifndef DEF_SYSTEM_SHELL -#define DEF_SYSTEM_SHELL "sh" -#endif -#ifndef DEF_FAILSAFE_CLIENT -#define DEF_FAILSAFE_CLIENT "/XFree86/bin/xterm" -#endif -#ifndef DEF_XDM_CONFIG -#define DEF_XDM_CONFIG "/XFree86/lib/X11/xdm/xdm-config" -#endif -#ifndef DEF_CHOOSER -#define DEF_CHOOSER "/XFree86/lib/X11/xdm/chooser" -#endif -#ifndef DEF_AUTH_NAME -#ifdef HASXDMAUTH -#define DEF_AUTH_NAME "XDM-AUTHORIZATION-1 MIT-MAGIC-COOKIE-1" -#else -#define DEF_AUTH_NAME "MIT-MAGIC-COOKIE-1" -#endif -#endif -#ifndef DEF_AUTH_DIR -#define DEF_AUTH_DIR "/XFree86/lib/X11/xdm" -#endif -#ifndef DEF_USER_AUTH_DIR -#define DEF_USER_AUTH_DIR "/tmp" -#endif -#ifndef DEF_KEY_FILE -#define DEF_KEY_FILE "" -#endif -#ifndef DEF_ACCESS_FILE -#define DEF_ACCESS_FILE "" -#endif -#ifndef DEF_RANDOM_FILE -#define DEF_RANDOM_FILE "" -#endif -#ifndef DEF_GREETER_LIB -#define DEF_GREETER_LIB "/XFree86/lib/X11/xdm/libXdmGreet.so" -#endif - -#endif /* __EMX__ */ #define DEF_UDP_PORT "177" /* registered XDMCP port, dont change */ |