summaryrefslogtreecommitdiff
path: root/src/nsgui.h
diff options
context:
space:
mode:
authorAlexander Gramiak <agrambot@gmail.com>2019-05-09 17:48:55 -0600
committerAlexander Gramiak <agrambot@gmail.com>2019-05-19 19:50:32 -0600
commit44d577925e0f5679d417028799db47a1f5d0fd03 (patch)
tree15abf340cede68d6b867804459cf06999c22b821 /src/nsgui.h
parent06db2a052fb7335185e8d581d245ce214b3bba7c (diff)
downloademacs-44d577925e0f5679d417028799db47a1f5d0fd03.tar.gz
Introduce Emacs_Pixmap typedef
* src/dispextern.h [HAVE_X_WINDOWS]: Alias Emacs_Pixmap to Pixmap. (image, x_kill_gs_process): Use Emacs_Pixmap over Pixmap. * src/image.c: * src/nsgui.h: * src/nsterm.m: * src/termhooks.h: * src/w32gui.h: * src/w32term.c: * src/w32term.h: * src/xterm.c (x_free_pixmap): Use Emacs_Pixmap over Pixmap. * src/w32gui.h: Remove unused typedef Bitmap.
Diffstat (limited to 'src/nsgui.h')
-rw-r--r--src/nsgui.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsgui.h b/src/nsgui.h
index 1a0453fa4a4..c6f0f4b0eae 100644
--- a/src/nsgui.h
+++ b/src/nsgui.h
@@ -96,9 +96,9 @@ typedef XGCValues * GC;
#define GCFont 0x03
#ifdef __OBJC__
-typedef id Pixmap;
+typedef id Emacs_Pixmap;
#else
-typedef void *Pixmap;
+typedef void *Emacs_Pixmap;
#endif
#ifdef __OBJC__