diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-07 12:17:07 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-07 12:17:07 +0100 |
| commit | 0e950715b62dcf30ffbf69831bf932fd348537e5 (patch) | |
| tree | 83fdafc455e9906f029e2e1ad926fb35c98e7be9 /xkbcomp | |
| parent | 506537495e6d808f219361a5b270510c752e7a2e (diff) | |
| parent | 3f553aaceddc9b09363c73d9bea40eaea8164fc4 (diff) | |
| download | vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.gz vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.tar.bz2 vcxsrv-0e950715b62dcf30ffbf69831bf932fd348537e5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013
Conflicts:
fontconfig/src/fcatomic.c
pixman/pixman/pixman-mmx.c
pixman/pixman/pixman-sse2.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/wincursor.c
xorg-server/hw/xwin/winmsg.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winsetsp.c
xorg-server/hw/xwin/winwin32rootless.c
xorg-server/xfixes/cursor.c
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/xkbcomp.c | 3 | ||||
| -rw-r--r-- | xkbcomp/xkbpath.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/xkbcomp/xkbcomp.c b/xkbcomp/xkbcomp.c index 834c777ee..0dc5bc285 100644 --- a/xkbcomp/xkbcomp.c +++ b/xkbcomp/xkbcomp.c @@ -47,9 +47,6 @@ #include "tokens.h" #include <X11/extensions/XKBgeom.h> -#ifdef __UNIXOS2__ -#define chdir _chdir2 -#endif #ifdef WIN32 #define S_IRGRP 0 diff --git a/xkbcomp/xkbpath.c b/xkbcomp/xkbpath.c index f5b21e6b8..59f5645a5 100644 --- a/xkbcomp/xkbpath.c +++ b/xkbcomp/xkbpath.c @@ -214,9 +214,6 @@ XkbAddDirectoryToPath(const char *dir) XkbClearIncludePath(); return True; } -#ifdef __UNIXOS2__ - dir = (char *) __XOS2RedirRoot(dir); -#endif len = strlen(dir); if (len + 2 >= PATH_MAX) { /* allow for '/' and at least one character */ |