diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2002-10-25 06:50:01 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2002-10-25 06:50:01 +0000 |
| commit | 68c7e82a0e5a12f599394eca897130873e44fcef (patch) | |
| tree | 29b0aa3488c14117bf9a282e2bf06bc4ec81dda6 | |
| parent | 94e32607840a58fe56afa80801915607bf168125 (diff) | |
| download | emacs-68c7e82a0e5a12f599394eca897130873e44fcef.tar.gz | |
Remove definition of XColor.
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/macgui.h | 10 | ||||
| -rw-r--r-- | src/w32gui.h | 10 |
3 files changed, 8 insertions, 21 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b7bf38954e2..d66250c18ee 100644 --- 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 87c8cc48f04..a6ad18fddcf 100644 --- 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 4121639fbf6..9f59290027c 100644 --- 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; |