summaryrefslogtreecommitdiff
path: root/src/image.c
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2022-01-06 14:10:52 +0800
committerPo Lu <luangruo@yahoo.com>2022-01-06 14:10:52 +0800
commit3b1164de0ed126686977e8688f2e09268cb74e4d (patch)
tree5819ef24d85cac330b2f741c3b29296b6b2083e6 /src/image.c
parente882dd48e3c3d6aa443383016c36f53683cd3048 (diff)
downloademacs-3b1164de0ed126686977e8688f2e09268cb74e4d.tar.gz
Fix GNUstep compilation warnings
* src/Makefile.in (NON_OBJC_CFLAGS): Add `-Wnested-externs'. * src/emacs.c (load_pdump): Only define exec_bufsize if !NS_SELF_CONTAINED. * src/image.c (ARGB_TO_ULONG): Don't define if HAVE_NS. * src/nsterm.m (ns_destroy_window): Pacify incorrect GCC warning. (ns_query_color): Make static. (ns_run_loop_break): Fix old-style definition. ([EmacsView toggleFullScreen:]): Remove unused variable.
Diffstat (limited to 'src/image.c')
-rw-r--r--src/image.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/image.c b/src/image.c
index 439348759fd..e7d347b7820 100644
--- a/src/image.c
+++ b/src/image.c
@@ -82,7 +82,9 @@ typedef struct x_bitmap_record Bitmap_Record;
#if defined(USE_CAIRO) || defined(HAVE_NS)
#define RGB_TO_ULONG(r, g, b) (((r) << 16) | ((g) << 8) | (b))
+#ifndef HAVE_NS
#define ARGB_TO_ULONG(a, r, g, b) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
+#endif
#define RED_FROM_ULONG(color) (((color) >> 16) & 0xff)
#define GREEN_FROM_ULONG(color) (((color) >> 8) & 0xff)
#define BLUE_FROM_ULONG(color) ((color) & 0xff)