Move Pixel typedef from xwd.c to wsutils.h

Removes need for including <X11/Intrinsic.h> in multiVis.c just to get
the Pixel typedef, which resolves
https://bugs.freedesktop.org/show_bug.cgi?id=47462 without adding a
dependency on libXt.

Change-Id: I3fd3b94a6e38fe939f8be232f6c6ccef584c2fef
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>

diff --git a/multiVis.c b/multiVis.c
index a445129..78375af 100644 (file)
--- a/multiVis.c
+++ b/multiVis.c
@@ -38,7 +38,6 @@ from The Open Group.
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/X.h>
-#include <X11/Intrinsic.h>
 #include <stdio.h>
 #include "list.h"
 #include "wsutils.h"

diff --git a/wsutils.h b/wsutils.h
index 67aba90..bf43a18 100644 (file)
--- a/wsutils.h
+++ b/wsutils.h
@@ -41,6 +41,8 @@ from The Open Group.
  *
  ******************************************************************************/
 
+typedef unsigned long Pixel;
+
 /* This is the actual structure returned by the X server describing the
  * SERVER_OVERLAY_VISUAL property.
  */

diff --git a/xwd.c b/xwd.c
index 30752f8..49adc46 100644 (file)
--- a/xwd.c
+++ b/xwd.c
@@ -71,7 +71,6 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-typedef unsigned long Pixel;
 #include "X11/XWDFile.h"
 
 #define FEEP_VOLUME 0