From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 23 Oct 2002 16:55:33 +0000 (+0000)
Subject: Remove definition of XColor.
X-Git-Tag: ttn-vms-21-2-B4~12740
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e99833cab6c4098a4916af3d7beefad59ceb4012;p=emacs.git

Remove definition of XColor.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 65746254999..fc1ec8c2565 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2002-10-23  Juanma Barranquero  <lektu@terra.es>
+
+	Patch suggested by Jay Finger <jay_finger@hotmail.com>.
+
+	* w32term.c (w32_term_init): Pass XColor to w32_define_color, not
+	COLORREF.
+
+	* macgui.h:
+	* w32gui.h: Add definition of XColor.
+
+	* macfns.c:
+	* w32fns.c:
+	* xfaces.c: Remove definition of XColor.
+
 2002-10-21  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* casefiddle.c (casify_region): Don't treat a prefix char as part
diff --git a/src/macfns.c b/src/macfns.c
index 44bbb3130e2..e2fe2969dfb 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -99,16 +99,6 @@ extern double atof ();
 extern int w32_console_toggle_lock_key (int vk_code, Lisp_Object new_state);
 extern int quit_char;*/
 
-/* 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
-
 extern char *lispy_function_keys[];
 
 /* The gray bitmap `bitmaps/gray'.  This is done because macterm.c uses
diff --git a/src/w32fns.c b/src/w32fns.c
index f4dd0421694..bfdf34b15ce 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -64,16 +64,6 @@ extern void w32_free_menu_strings P_ ((HWND));
 
 extern int quit_char;
 
-/* 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
-
 extern char *lispy_function_keys[];
 
 /* The gray bitmap `bitmaps/gray'.  This is done because w32term.c uses
diff --git a/src/xfaces.c b/src/xfaces.c
index d5ddd6b40de..e66bc16192a 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -297,21 +297,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define FACE_CACHE_BUCKETS_SIZE 1001
 
-/* 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 /* not HAVE_X_WINDOWS */
-
 /* Keyword symbols used for face attribute names.  */
 
 Lisp_Object QCfamily, QCheight, QCweight, QCslant, QCunderline;