diff options
author | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
commit | 1678a69116d1c6ce900fe15f7813613bb28416dd (patch) | |
tree | 9589536f6b4bd60b34f90cf5ed20240d40bbb38c /libXft/src/xftcolor.c | |
parent | 9d911bc1246139019e555f443e934677a067bc0a (diff) | |
parent | b2c925e360e2c366526de15b44603f855f94139c (diff) | |
download | vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2 vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
libfontenc/src/fontenc.c
Diffstat (limited to 'libXft/src/xftcolor.c')
-rw-r--r-- | libXft/src/xftcolor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libXft/src/xftcolor.c b/libXft/src/xftcolor.c index 77872efa4..a323822bd 100644 --- a/libXft/src/xftcolor.c +++ b/libXft/src/xftcolor.c @@ -30,7 +30,7 @@ XftColorAllocName (Display *dpy, XftColor *result) { XColor screen, exact; - + if (!XAllocNamedColor (dpy, cmap, name, &screen, &exact)) { /* XXX stick standard colormap stuff here */ @@ -97,7 +97,7 @@ XftColorAllocValue (Display *dpy, else { XColor xcolor; - + xcolor.red = color->red; xcolor.green = color->green; xcolor.blue = color->blue; @@ -112,7 +112,7 @@ XftColorAllocValue (Display *dpy, return True; } -_X_EXPORT void +_X_EXPORT void XftColorFree (Display *dpy, Visual *visual, Colormap cmap, |