Fixed bug 3874 - Compiler warnings SDL_Surface.c and SDL_cocoakeyboard.m
authorSam Lantinga <slouken@libsdl.org>
Thu, 12 Oct 2017 08:41:11 -0700
changeset 11604634c34c79fbc
parent 11603 d94abaa07d8e
child 11605 b914622c734e
Fixed bug 3874 - Compiler warnings SDL_Surface.c and SDL_cocoakeyboard.m
src/test/SDL_test_common.c
src/video/cocoa/SDL_cocoakeyboard.m
     1.1 --- a/src/test/SDL_test_common.c	Thu Oct 12 08:37:55 2017 -0700
     1.2 +++ b/src/test/SDL_test_common.c	Thu Oct 12 08:41:11 2017 -0700
     1.3 @@ -939,7 +939,7 @@
     1.4              }
     1.5  
     1.6              /* Add resize/drag areas for windows that are borderless and resizable */
     1.7 -            if ((state->window_flags & SDL_WINDOW_RESIZABLE|SDL_WINDOW_BORDERLESS) ==
     1.8 +            if ((state->window_flags & (SDL_WINDOW_RESIZABLE|SDL_WINDOW_BORDERLESS)) ==
     1.9                  (SDL_WINDOW_RESIZABLE|SDL_WINDOW_BORDERLESS)) {
    1.10                  SDL_SetWindowHitTest(state->windows[i], SDLTest_ExampleHitTestCallback, NULL);
    1.11              }
     2.1 --- a/src/video/cocoa/SDL_cocoakeyboard.m	Thu Oct 12 08:37:55 2017 -0700
     2.2 +++ b/src/video/cocoa/SDL_cocoakeyboard.m	Thu Oct 12 08:41:11 2017 -0700
     2.3 @@ -93,7 +93,7 @@
     2.4      return _selectedRange;
     2.5  }
     2.6  
     2.7 -- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange;
     2.8 +- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange
     2.9  {
    2.10      if ([aString isKindOfClass:[NSAttributedString class]]) {
    2.11          aString = [aString string];
    2.12 @@ -127,7 +127,7 @@
    2.13      SDL_SendEditingText("", 0, 0);
    2.14  }
    2.15  
    2.16 -- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
    2.17 +- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
    2.18  {
    2.19      NSWindow *window = [self window];
    2.20      NSRect contentRect = [window contentRectForFrameRect:[window frame]];
    2.21 @@ -155,7 +155,7 @@
    2.22      return rect;
    2.23  }
    2.24  
    2.25 -- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
    2.26 +- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
    2.27  {
    2.28      DEBUG_IME(@"attributedSubstringFromRange: (%d, %d)", aRange.location, aRange.length);
    2.29      return nil;