From: Philipp Stephani Date: Sat, 23 Jan 2021 18:08:52 +0000 (+0100) Subject: Avoid a few compilation warnings in Objective-C code. X-Git-Tag: emacs-28.0.90~4139 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=17fec603709eb879297a4a0ff0c535c00a13066b;p=emacs.git Avoid a few compilation warnings in Objective-C code. * src/nsfns.m (Fns_frame_restack): Remove unused variable 'flag'. * src/nsmenu.m (ns_update_menubar): Remove unused variable 'pool'. * src/nsterm.m (focus_view, hide_bell): Define conditionally. (ns_update_end): Define variable 'view' conditionally. (ns_redraw_scroll_bars): Don't define unused function. (copyRect): Don't perform arithmetic on 'void' pointers. (nswindow_orderedIndex_sort): Make static. --- diff --git a/src/nsfns.m b/src/nsfns.m index ae114f83e4d..24ea7d7f63b 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1487,7 +1487,6 @@ Some window managers may refuse to restack windows. */) { EmacsWindow *window = (EmacsWindow *)[FRAME_NS_VIEW (f1) window]; NSWindow *window2 = [FRAME_NS_VIEW (f2) window]; - BOOL flag = !NILP (above); if ([window restackWindow:window2 above:!NILP (above)]) return Qt; diff --git a/src/nsmenu.m b/src/nsmenu.m index 8086f56854e..f8219d27026 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -101,7 +101,6 @@ popup_activated (void) static void ns_update_menubar (struct frame *f, bool deep_p) { - NSAutoreleasePool *pool; BOOL needsSet = NO; id menu = [NSApp mainMenu]; bool owfi; diff --git a/src/nsterm.m b/src/nsterm.m index c5815ce8d10..df3934c5c34 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -272,7 +272,9 @@ long context_menu_value = 0; /* display update */ static struct frame *ns_updating_frame; +#if !defined (NS_DRAW_TO_BUFFER) || MAC_OS_X_VERSION_MIN_REQUIRED < 101400 static NSView *focus_view = NULL; +#endif static int ns_window_num = 0; static BOOL gsaved = NO; static BOOL ns_fake_keydown = NO; @@ -1139,7 +1141,9 @@ ns_update_end (struct frame *f) external (RIF) call; for whole frame, called after gui_update_window_end -------------------------------------------------------------------------- */ { +#if !defined (NS_DRAW_TO_BUFFER) || MAC_OS_X_VERSION_MIN_REQUIRED < 101400 EmacsView *view = FRAME_NS_VIEW (f); +#endif NSTRACE_WHEN (NSTRACE_GROUP_UPDATES, "ns_update_end"); @@ -1449,7 +1453,7 @@ ns_ring_bell (struct frame *f) } } - +#if !defined (NS_DRAW_TO_BUFFER) || MAC_OS_X_VERSION_MIN_REQUIRED < 101400 static void hide_bell (void) /* -------------------------------------------------------------------------- @@ -1463,6 +1467,7 @@ hide_bell (void) [bell_view remove]; } } +#endif /* ========================================================================== @@ -2876,6 +2881,8 @@ ns_get_shifted_character (NSEvent *event) ========================================================================== */ +#if 0 +/* FIXME: Remove this function. */ static void ns_redraw_scroll_bars (struct frame *f) { @@ -2890,6 +2897,7 @@ ns_redraw_scroll_bars (struct frame *f) [view display]; } } +#endif void @@ -8399,21 +8407,23 @@ not_in_argv (NSString *arg) void *pixels = CGBitmapContextGetData (context); int rowSize = CGBitmapContextGetBytesPerRow (context); int srcRowSize = NSWidth (srcRect) * scale * bpp; - void *srcPixels = pixels + (int)(NSMinY (srcRect) * scale * rowSize - + NSMinX (srcRect) * scale * bpp); - void *dstPixels = pixels + (int)(NSMinY (dstRect) * scale * rowSize - + NSMinX (dstRect) * scale * bpp); + void *srcPixels = (char *) pixels + + (int) (NSMinY (srcRect) * scale * rowSize + + NSMinX (srcRect) * scale * bpp); + void *dstPixels = (char *) pixels + + (int) (NSMinY (dstRect) * scale * rowSize + + NSMinX (dstRect) * scale * bpp); if (NSIntersectsRect (srcRect, dstRect) && NSMinY (srcRect) < NSMinY (dstRect)) for (int y = NSHeight (srcRect) * scale - 1 ; y >= 0 ; y--) - memmove (dstPixels + y * rowSize, - srcPixels + y * rowSize, + memmove ((char *) dstPixels + y * rowSize, + (char *) srcPixels + y * rowSize, srcRowSize); else for (int y = 0 ; y < NSHeight (srcRect) * scale ; y++) - memmove (dstPixels + y * rowSize, - srcPixels + y * rowSize, + memmove ((char *) dstPixels + y * rowSize, + (char *) srcPixels + y * rowSize, srcRowSize); #if MAC_OS_X_VERSION_MIN_REQUIRED < 101400 @@ -8742,7 +8752,8 @@ not_in_argv (NSString *arg) /* The array returned by [NSWindow parentWindow] may already be sorted, but the documentation doesn't tell us whether or not it is, so to be safe we'll sort it. */ -NSInteger nswindow_orderedIndex_sort (id w1, id w2, void *c) +static NSInteger +nswindow_orderedIndex_sort (id w1, id w2, void *c) { NSInteger i1 = [w1 orderedIndex]; NSInteger i2 = [w2 orderedIndex];