Remove definition of XColor.

diff --git a/src/ChangeLog b/src/ChangeLog
index b7bf38954e2f064eed2aadba4f5c6acc15f29ba2..d66250c18ee4f2bc324e8cdf353ca8a6c1213da1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,10 +1,17 @@
+2002-10-25  Juanma Barranquero  <lektu@terra.es>
+
+       * macgui.h:
+       * w32gui.h: Remove definition of XColor.
+
+       * dispextern.h [!HAVE_X_WINDOWS]: Define XColor.
+
 2002-10-24  Kim F. Storm  <storm@cua.dk>
 
        * xdisp.c (get_window_cursor_type): New arg ACTIVE_CURSOR.
        Callers changed (supply dummy arg).
 
        * lisp.h (get_window_cursor_type): Update prototype.
-       
+
        * w32term.c (x_display_and_set_cursor): Get active_cursor from
        get_window_cursor_type to track system caret.
 

diff --git a/src/macgui.h b/src/macgui.h
index 87c8cc48f04b38cde53b0f5aa4eb1c8be6bb9105..a6ad18fddcffe1eccf5c881dc7308163fadfabe1 100644 (file)
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -37,16 +37,6 @@ typedef struct OpaqueWindowPtr* Window;
 typedef WindowPtr Window;
 #endif
 
-/* A definition of XColor for non-X frames.  */
-#ifndef HAVE_X_WINDOWS
-typedef struct {
-  unsigned long pixel;
-  unsigned short red, green, blue;
-  char flags;
-  char pad;
-} XColor;
-#endif
-
 #define FACE_DEFAULT (~0)
 
 

diff --git a/src/w32gui.h b/src/w32gui.h
index 4121639fbf64cf82a0ddcb5ca4d3c5d9d1279eb4..9f59290027cb1a0fd457f7ed734a7718a6b1e0a8 100644 (file)
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -86,16 +86,6 @@ typedef struct _XImage
   /* Optional RGBQUAD array for palette follows (see BITMAPINFO docs).  */
 } XImage;
 
-/* A definition of XColor for non-X frames.  */
-#ifndef HAVE_X_WINDOWS
-typedef struct {
-  unsigned long pixel;
-  unsigned short red, green, blue;
-  char flags;
-  char pad;
-} XColor;
-#endif
-
 #define FACE_DEFAULT (~0)
 
 extern HINSTANCE hinst;