diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-29 16:21:42 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-29 16:21:42 +0200 |
| commit | 4a9e1f51655e03da1507dabce7c4c3960e7ca607 (patch) | |
| tree | 0298f6e38550e2f888eab0146ce7a51a49faaa10 /libXft/src/xftdpy.c | |
| parent | 0e68f72b7b0ab957a0d3c9415f68e3c4f484b0b3 (diff) | |
| parent | bee9191042416cbfb848615189ca1e2a0069f022 (diff) | |
| download | vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.tar.gz vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.tar.bz2 vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXft/src/xftdpy.c')
| -rw-r--r-- | libXft/src/xftdpy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libXft/src/xftdpy.c b/libXft/src/xftdpy.c index 747b8db81..8f453b30d 100644 --- a/libXft/src/xftdpy.c +++ b/libXft/src/xftdpy.c @@ -282,7 +282,7 @@ XftDefaultSet (Display *dpy, FcPattern *defaults) } _X_HIDDEN int -XftDefaultParseBool (char *v) +XftDefaultParseBool (const char *v) { char c0, c1; @@ -307,7 +307,7 @@ XftDefaultParseBool (char *v) } static Bool -_XftDefaultInitBool (Display *dpy, FcPattern *pat, char *option) +_XftDefaultInitBool (Display *dpy, FcPattern *pat, const char *option) { char *v; int i; @@ -319,7 +319,7 @@ _XftDefaultInitBool (Display *dpy, FcPattern *pat, char *option) } static Bool -_XftDefaultInitDouble (Display *dpy, FcPattern *pat, char *option) +_XftDefaultInitDouble (Display *dpy, FcPattern *pat, const char *option) { char *v, *e; double d; @@ -335,7 +335,7 @@ _XftDefaultInitDouble (Display *dpy, FcPattern *pat, char *option) } static Bool -_XftDefaultInitInteger (Display *dpy, FcPattern *pat, char *option) +_XftDefaultInitInteger (Display *dpy, FcPattern *pat, const char *option) { char *v, *e; int i; |