diff options
| author | Alexander Gramiak <agrambot@gmail.com> | 2019-05-09 13:07:35 -0600 |
|---|---|---|
| committer | Alexander Gramiak <agrambot@gmail.com> | 2019-05-19 19:50:32 -0600 |
| commit | c0e146e4ec266edf348473c3db7ca8d16745f4f7 (patch) | |
| tree | 3f2070ccbf941ba14f43836f7cfa1b4c78979043 /src/w32fns.c | |
| parent | 05b79539f4d22bfe5160777aa5a963aeb74b000c (diff) | |
| download | emacs-c0e146e4ec266edf348473c3db7ca8d16745f4f7.tar.gz emacs-c0e146e4ec266edf348473c3db7ca8d16745f4f7.tar.bz2 emacs-c0e146e4ec266edf348473c3db7ca8d16745f4f7.zip | |
Introduce Emacs_Color struct and typedef
This avoids clashing with the XColor struct from X.
* src/dispextern [HAVE_X_WINDOWS]: Define Emacs_Color alias.
[!HAVE_X_WINDOWS]: Rename XColor compatibility struct to
Emacs_Color. Remove unused fields.
* src/gtkutil.c:
* src/gtkutil.h:
* src/image.c:
* src/nsterm.h:
* src/nsterm.m:
* src/termhooks.h:
* src/w32fns.c:
* src/w32term.c:
* src/w32term.h:
* src/xfaces.c:
* src/xfns.c:
* src/xterm.h: Use Emacs_Color over XColor outside of X-specific
sections.
Diffstat (limited to 'src/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index 525642bfaab..2f54bdc1da1 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -1174,7 +1174,7 @@ gamma_correct (struct frame *f, COLORREF *color) If ALLOC is nonzero, allocate a new colormap cell. */ bool -w32_defined_color (struct frame *f, const char *color, XColor *color_def, +w32_defined_color (struct frame *f, const char *color, Emacs_Color *color_def, bool alloc_p, bool _makeIndex) { register Lisp_Object tem; @@ -1248,7 +1248,7 @@ w32_defined_color (struct frame *f, const char *color, XColor *color_def, static int w32_decode_color (struct frame *f, Lisp_Object arg, int def) { - XColor cdef; + Emacs_Color cdef; CHECK_STRING (arg); @@ -6100,7 +6100,7 @@ DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, doc: /* SKIP: real doc in xfns.c. */) (Lisp_Object color, Lisp_Object frame) { - XColor foo; + Emacs_Color foo; struct frame *f = decode_window_system_frame (frame); CHECK_STRING (color); @@ -6115,7 +6115,7 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0, doc: /* SKIP: real doc in xfns.c. */) (Lisp_Object color, Lisp_Object frame) { - XColor foo; + Emacs_Color foo; struct frame *f = decode_window_system_frame (frame); CHECK_STRING (color); |