diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-26 17:08:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-26 17:08:48 +0200 |
| commit | 95acf9816e008fa46a6c2fa2f35500deb358bb69 (patch) | |
| tree | ad86feed38d780515cf9da608c5ea21eed04e17d /libXft/src | |
| parent | 4f67039e9191d5251c39069bd791a05c5cf22022 (diff) | |
| parent | 873965b49f283ad028dd4e0e5b7e93a758c84993 (diff) | |
| download | vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.tar.gz vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.tar.bz2 vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libXmu/src/CmapAlloc.c
Diffstat (limited to 'libXft/src')
| -rw-r--r-- | libXft/src/xftglyphs.c | 2 | ||||
| -rw-r--r-- | libXft/src/xftinit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libXft/src/xftglyphs.c b/libXft/src/xftglyphs.c index 8e0d247a0..e0cfdea8a 100644 --- a/libXft/src/xftglyphs.c +++ b/libXft/src/xftglyphs.c @@ -428,7 +428,7 @@ XftFontLoadGlyphs (Display *dpy, { if (font->info.antialias) { - static char den[] = { " .:;=+*#" }; + static const char den[] = { " .:;=+*#" }; for (x = 0; x < pitch; x++) printf ("%c", den[line[x] >> 5]); } diff --git a/libXft/src/xftinit.c b/libXft/src/xftinit.c index 43efc00e1..0205e4b36 100644 --- a/libXft/src/xftinit.c +++ b/libXft/src/xftinit.c @@ -58,7 +58,7 @@ static struct { static int XftAllocCount, XftAllocMem; static int XftFreeCount, XftFreeMem; -static int XftMemNotice = 1*1024*1024; +static const int XftMemNotice = 1*1024*1024; static int XftAllocNotify, XftFreeNotify; |