diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-07-03 16:32:11 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-07-03 16:32:11 +0200 |
| commit | c86a119da96c73914de91935db1daff04edf3b0b (patch) | |
| tree | 5a97c8adfeb3d829b6bcdc301106d8d9cfb24b5d /nx-X11/programs/Xserver/xkb/ddxLoad.c | |
| parent | b1e4d6e849c54b61fe1c7de0cde58394225d20bf (diff) | |
| parent | b82a6a1077c72670f03213fc2513a68d2ce8d3b1 (diff) | |
| download | nx-libs-c86a119da96c73914de91935db1daff04edf3b0b.tar.gz nx-libs-c86a119da96c73914de91935db1daff04edf3b0b.tar.bz2 nx-libs-c86a119da96c73914de91935db1daff04edf3b0b.zip | |
Merge branch 'uli42-gh-sunweaver/pr/xserver-xkb-cleanup' into 3.6.x
Attributes GH PR #706: https://github.com/ArcticaProject/nx-libs/pull/706
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/ddxLoad.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/ddxLoad.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c index 5f24e9ccc..83db4350c 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c @@ -520,7 +520,7 @@ OutputDirectory( } } -Bool +static Bool XkbDDXCompileNamedKeymap( XkbDescPtr xkb, XkbComponentNamesPtr names, char * nameRtrn, @@ -610,7 +610,7 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; return False; } -Bool +static Bool XkbDDXCompileKeymapByNames( XkbDescPtr xkb, XkbComponentNamesPtr names, unsigned want, @@ -762,7 +762,7 @@ char tmpname[PATH_MAX]; return False; } -FILE * +static FILE * XkbDDXOpenConfigFile(char *mapName,char *fileNameRtrn,int fileNameRtrnLen) { char buf[PATH_MAX],xkm_output_dir[PATH_MAX]; |