diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:47:32 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:47:32 +0200 |
| commit | 01ed75712979168d0355bd594a741c02a088685c (patch) | |
| tree | 86b201be89e6f14d2ab1936a711fc76f55a1ee85 /nx-X11/programs/Xserver | |
| parent | 30463b084b2833193aa6fdc2ceafefc8a1c06fee (diff) | |
| download | nx-libs-01ed75712979168d0355bd594a741c02a088685c.tar.gz nx-libs-01ed75712979168d0355bd594a741c02a088685c.tar.bz2 nx-libs-01ed75712979168d0355bd594a741c02a088685c.zip | |
Imported nx-X11-3.3.0-3.tar.gznx-X11/3.3.0-3
Summary: Imported nx-X11-3.3.0-3.tar.gz
Keywords:
Imported nx-X11-3.3.0-3.tar.gz
into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/ddxLoad.c | 8 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c index 8def401e8..8e35ab82a 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c @@ -559,7 +559,7 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; #ifndef __UNIXOS2__ #ifdef NXAGENT_SERVER - char *xkbbasedir = _NXGetXkbCompPath(XkbBaseDirectory); + char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory); char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory); #else char *xkbbasedir = XkbBaseDirectory; @@ -569,7 +569,7 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; #else /* relocate the basedir and replace the slashes with backslashes */ #ifdef NXAGENT_SERVER - char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBaseDirectory)); + char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory)); char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory)); #else char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory); @@ -675,7 +675,7 @@ char tmpname[PATH_MAX]; #endif #ifndef __UNIXOS2__ #ifdef NXAGENT_SERVER - char *xkbbasedir = _NXGetXkbCompPath(XkbBaseDirectory); + char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory); char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory); #else char *xkbbasedir = XkbBaseDirectory; @@ -684,7 +684,7 @@ char tmpname[PATH_MAX]; #else int i; #ifdef NXAGENT_SERVER - char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBaseDirectory)); + char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory)); char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory)); #else char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory); diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original b/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original index 8def401e8..8e35ab82a 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original @@ -559,7 +559,7 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; #ifndef __UNIXOS2__ #ifdef NXAGENT_SERVER - char *xkbbasedir = _NXGetXkbCompPath(XkbBaseDirectory); + char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory); char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory); #else char *xkbbasedir = XkbBaseDirectory; @@ -569,7 +569,7 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; #else /* relocate the basedir and replace the slashes with backslashes */ #ifdef NXAGENT_SERVER - char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBaseDirectory)); + char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory)); char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory)); #else char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory); @@ -675,7 +675,7 @@ char tmpname[PATH_MAX]; #endif #ifndef __UNIXOS2__ #ifdef NXAGENT_SERVER - char *xkbbasedir = _NXGetXkbCompPath(XkbBaseDirectory); + char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory); char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory); #else char *xkbbasedir = XkbBaseDirectory; @@ -684,7 +684,7 @@ char tmpname[PATH_MAX]; #else int i; #ifdef NXAGENT_SERVER - char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBaseDirectory)); + char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory)); char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory)); #else char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory); |