summaryrefslogtreecommitdiff
path: root/src/xfaces.c
diff options
context:
space:
mode:
authorJim Blandy <jimb@redhat.com>1993-05-30 20:34:54 +0000
committerJim Blandy <jimb@redhat.com>1993-05-30 20:34:54 +0000
commit7a4d2269a76ed16fdd09bcf02432533b464b5308 (patch)
treec883dddca96b8898eb33af2d20c2cf0633b5d1b0 /src/xfaces.c
parent15924ff722cd85b073f5641fbad310779ec68bb7 (diff)
downloademacs-7a4d2269a76ed16fdd09bcf02432533b464b5308.tar.gz
* xfaces.c (unload_color): Don't #include <X11/Intrinsic.h>,
<X11/StringDefs.h>, or <X11/Xmu/Drawing.h>. Just write out "unsigned long" instead of using the "Pixel" typedef; it's in the protocol, so it's not likely to change.
Diffstat (limited to 'src/xfaces.c')
-rw-r--r--src/xfaces.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 92679312b24..c07bf035f5b 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -40,10 +40,14 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define __TIMEVAL__
#endif
+/* These don't seem to be used. */
+#if 0
/* Display Context for the icons */
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
-/* #include <X11/Xmu/Drawing.h> */ /* Appears not to be used */
+#include <X11/Xmu/Drawing.h>
+#endif
+
#include <X11/Xos.h>
@@ -428,7 +432,7 @@ load_color (f, name)
static void
unload_color (f, pixel)
struct frame *f;
- Pixel pixel;
+ unsigned long pixel;
{
/* Since faces get built by copying parameters from other faces, the
allocation counts for the colors get all screwed up. I don't see