comparison lwlib/lwlib-colors.h @ 4969:cbe181529c34

Automatic merge
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 21:46:21 -0600
parents a6c778975d7d
children 8b2f75cecb89
comparison
equal deleted inserted replaced
4968:4d35e52790f8 4969:cbe181529c34
37 XColor *color_def); 37 XColor *color_def);
38 /* haired-up version from ../src/objects-x.c */ 38 /* haired-up version from ../src/objects-x.c */
39 int x_allocate_nearest_color (Display *display, Colormap screen_colormap, 39 int x_allocate_nearest_color (Display *display, Colormap screen_colormap,
40 Visual *visual, XColor *color_def); 40 Visual *visual, XColor *color_def);
41 41
42 #ifdef USE_XFT 42 #ifdef HAVE_XFT
43 #define _XFT_NO_COMPAT_ 43 #define _XFT_NO_COMPAT_
44 /* shut up GCC */ 44 /* shut up GCC */
45 #define face_index face_index_arg 45 #define face_index face_index_arg
46 #define glyph_index glyph_index_arg 46 #define glyph_index glyph_index_arg
47 #include <X11/Xft/Xft.h> 47 #include <X11/Xft/Xft.h>
52 #error Xft versions < 2 not supported 52 #error Xft versions < 2 not supported
53 #endif 53 #endif
54 54
55 XftColor xft_convert_color (Display *dpy, Colormap cmap, Visual *visual, 55 XftColor xft_convert_color (Display *dpy, Colormap cmap, Visual *visual,
56 int c, int dim); 56 int c, int dim);
57 #endif /* USE_XFT */ 57 #endif /* HAVE_XFT */
58 58
59 #endif /* INCLUDED_lwlib_colors_h_ */ 59 #endif /* INCLUDED_lwlib_colors_h_ */