diff options
| author | Juanma Barranquero <[email protected]> | 2002-10-23 16:55:33 +0000 |
|---|---|---|
| committer | Juanma Barranquero <[email protected]> | 2002-10-23 16:55:33 +0000 |
| commit | e99833cab6c4098a4916af3d7beefad59ceb4012 (patch) | |
| tree | 503f0acaf3c5d2a0e242afa90cdc514f9098aa17 | |
| parent | b9c3f7eb150b3e91c83c1fccc34de075d8ef9a6d (diff) | |
Remove definition of XColor.
| -rw-r--r-- | src/ChangeLog | 14 | ||||
| -rw-r--r-- | src/macfns.c | 10 | ||||
| -rw-r--r-- | src/w32fns.c | 10 | ||||
| -rw-r--r-- | src/xfaces.c | 15 |
4 files changed, 14 insertions, 35 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6574625499..fc1ec8c256 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,17 @@ +2002-10-23 Juanma Barranquero <[email protected]> + + Patch suggested by Jay Finger <[email protected]>. + + * 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 <[email protected]> * casefiddle.c (casify_region): Don't treat a prefix char as part diff --git a/src/macfns.c b/src/macfns.c index 44bbb3130e..e2fe2969df 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 f4dd042169..bfdf34b15c 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 d5ddd6b40d..e66bc16192 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; |