diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-05-07 16:00:44 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-05-07 16:00:44 +0200 |
| commit | e91d08cb8d1fd529e33f9ef9924b3a7cdfea2df0 (patch) | |
| tree | a8fbc3bfb442ef8222367b9a5b2285c9e6408fda /nx-X11/programs/Xserver/dix/dixfonts.c | |
| parent | 424c0e8ee3986b886bf2d7617897577a6b84aaed (diff) | |
| parent | c69d2ad0fc5f69163c4babc7a356a783aa7ae411 (diff) | |
| download | nx-libs-e91d08cb8d1fd529e33f9ef9924b3a7cdfea2df0.tar.gz nx-libs-e91d08cb8d1fd529e33f9ef9924b3a7cdfea2df0.tar.bz2 nx-libs-e91d08cb8d1fd529e33f9ef9924b3a7cdfea2df0.zip | |
Merge branch 'uli42-pr/various4' into 3.6.x
Attributes GH PR #896: https://github.com/ArcticaProject/nx-libs/pull/896
Diffstat (limited to 'nx-X11/programs/Xserver/dix/dixfonts.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/dixfonts.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index f1fa53f69..e3e90b163 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -1958,9 +1958,12 @@ SetFontPath(ClientPtr client, int npaths, unsigned char *paths) return err; } -#ifndef NXAGENT_SERVER int +#ifdef NXAGENT_SERVER +xorg_SetDefaultFontPath(char *path) +#else SetDefaultFontPath(char *path) +#endif { char *temp_path, *start, @@ -2027,7 +2030,6 @@ SetDefaultFontPath(char *path) return err; } -#endif /* NXAGENT_SERVER */ unsigned char * GetFontPath(int *count, int *length) |