diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-29 08:21:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-29 08:21:31 +0200 |
| commit | bee9191042416cbfb848615189ca1e2a0069f022 (patch) | |
| tree | 8f7b2d550ca61d7a6ff10d1fb513fff371268ee0 /libXft | |
| parent | 18a8f9f6839dfd899814a76a971e720c1e622236 (diff) | |
| download | vcxsrv-bee9191042416cbfb848615189ca1e2a0069f022.tar.gz vcxsrv-bee9191042416cbfb848615189ca1e2a0069f022.tar.bz2 vcxsrv-bee9191042416cbfb848615189ca1e2a0069f022.zip | |
xwininfo libXft mesa git update 29 sep 2011
Diffstat (limited to 'libXft')
| -rw-r--r-- | libXft/src/xftdpy.c | 8 | ||||
| -rw-r--r-- | libXft/src/xftfreetype.c | 2 | ||||
| -rw-r--r-- | libXft/src/xftinit.c | 2 | ||||
| -rw-r--r-- | libXft/src/xftint.h | 2 |
4 files changed, 7 insertions, 7 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; diff --git a/libXft/src/xftfreetype.c b/libXft/src/xftfreetype.c index 3d930be78..3f8dfef8c 100644 --- a/libXft/src/xftfreetype.c +++ b/libXft/src/xftfreetype.c @@ -164,7 +164,7 @@ _XftLockFile (XftFtFile *f) } static void -_XftLockError (char *reason) +_XftLockError (const char *reason) { fprintf (stderr, "Xft: locking error %s\n", reason); } diff --git a/libXft/src/xftinit.c b/libXft/src/xftinit.c index 0205e4b36..ff2372297 100644 --- a/libXft/src/xftinit.c +++ b/libXft/src/xftinit.c @@ -43,7 +43,7 @@ XftGetVersion (void) } static struct { - char *name; + const char *name; int alloc_count; int alloc_mem; int free_count; diff --git a/libXft/src/xftint.h b/libXft/src/xftint.h index 43f9ebec9..eb9257ea7 100644 --- a/libXft/src/xftint.h +++ b/libXft/src/xftint.h @@ -376,7 +376,7 @@ void _XftDisplayManageMemory (Display *dpy); int -XftDefaultParseBool (char *v); +XftDefaultParseBool (const char *v); FcBool XftDefaultGetBool (Display *dpy, const char *object, int screen, FcBool def); |