diff options
Diffstat (limited to 'hw/xfree86/parser/scan.c')
| -rw-r--r-- | hw/xfree86/parser/scan.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index e7989d107..9706d483b 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw/xfree86/parser/scan.c @@ -64,6 +64,7 @@ #include <string.h> #include <unistd.h> #include <stdarg.h> +#include <X11/Xfuncproto.h> #if !defined(X_NOT_POSIX) #if defined(_POSIX_SOURCE) @@ -558,7 +559,6 @@ xf86pathIsSafe(const char *path) * %E config file environment ($XORGCONFIG) as an absolute path * %F config file environment ($XORGCONFIG) as a relative path * %G config file environment ($XORGCONFIG) as a safe path - * %D $HOME * %P projroot * %M major version number * %% % @@ -703,14 +703,6 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot, } else BAIL_OUT; break; - case 'D': - if (!home) - home = getenv("HOME"); - if (home && xf86pathIsAbsolute(home)) - APPEND_STR(home); - else - BAIL_OUT; - break; case 'P': if (projroot && xf86pathIsAbsolute(projroot)) APPEND_STR(projroot); @@ -948,7 +940,7 @@ StringToToken (char *str, xf86ConfigSymTabRec * tab) * Compare two names. The characters '_', ' ', and '\t' are ignored * in the comparison. */ -__attribute__((visibility("default"))) int +_X_EXPORT int xf86nameCompare (const char *s1, const char *s2) { char c1, c2; |