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/nsgui.h | |
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/nsgui.h')
-rw-r--r-- | src/nsgui.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/nsgui.h b/src/nsgui.h index ab6cdff1e5c..81be68b574d 100644 --- a/src/nsgui.h +++ b/src/nsgui.h @@ -109,11 +109,6 @@ typedef void *Cursor; #define No_Cursor (0) -#ifdef __OBJC__ -typedef NSColor * Color; -#else -typedef void * Color; -#endif typedef int Window; |