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/xfns.c | |
| parent | 05b79539f4d22bfe5160777aa5a963aeb74b000c (diff) | |
| download | emacs-c0e146e4ec266edf348473c3db7ca8d16745f4f7.tar.gz | |
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/xfns.c')
| -rw-r--r-- | src/xfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c index c8cc1704a47..4195980d33e 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -653,7 +653,7 @@ gamma_correct (struct frame *f, XColor *color) bool x_defined_color (struct frame *f, const char *color_name, - XColor *color, bool alloc_p, bool _makeIndex) + Emacs_Color *color, bool alloc_p, bool _makeIndex) { bool success_p = false; Colormap cmap = FRAME_X_COLORMAP (f); |