make it work with clang 3.1

Author: Al Lefant

addons/native_dialog/osx_dialog.m

@@ -169,12 +169,14 @@ int _al_show_native_message_box(ALLEGRO_DISPLAY *display,
                                 ALLEGRO_NATIVE_DIALOG *fd)
 {
     (void)display;
-    @autoreleasepool {
+    {
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
         NSValue* fdValue = [NSValue valueWithPointer:fd];
 
         [ALLEGAlertWrapper performSelectorOnMainThread: @selector(displayAlert:)
                                          withObject: fdValue
                                       waitUntilDone: YES];
+        [pool release];
     }
     _al_osx_clear_mouse_state();
     return fd->mb_pressed_button;
@@ -353,7 +355,7 @@ @interface ALLEGTargetManager : NSObject {
     NSMutableArray * _items;
 }
 +(ALLEGTargetManager*) sharedManager;
--(instancetype) init;
+-(id) init;
 -(void) dealloc;
 -(void) setMenu: (NSMenu*) menu forWindow:(NSWindow*) window;
 @end
@@ -372,7 +374,7 @@ @interface ALLEGMenuTarget : NSObject
     NSMenu* _menu;
 }
 -(NSMenu*) menu;
--(instancetype) initWithMenu:(ALLEGRO_MENU*) amenu; // Designated initializer
+-(id) initWithMenu:(ALLEGRO_MENU*) amenu; // Designated initializer
 -(NSMenu*) menu;
 -(void) show;
 -(void) showPopup;
@@ -535,7 +537,7 @@ - (ALLEGRO_MENU_ITEM*) allegroItemforItem: (NSMenuItem*) mi
     }
 }
 // Create target with ALLEGRO_MENU bound to it.
-- (instancetype)initWithMenu:(ALLEGRO_MENU*) source_menu
+- (id)initWithMenu:(ALLEGRO_MENU*) source_menu
 {
     self = [super init];
     if (self) {
@@ -546,7 +548,7 @@ - (instancetype)initWithMenu:(ALLEGRO_MENU*) source_menu
     }
     return self;
 }
--(instancetype) init
+-(id) init
 {
     /* This isn't a valid initializer */
     return nil;
@@ -657,7 +659,7 @@ +(ALLEGTargetManager*) sharedManager
     return _sharedmanager;
 }
 // Set up and register for notifications
--(instancetype) init
+-(id) init
 {
     self = [super init];
     if (self) {
@@ -714,7 +716,7 @@ -(void) setMenu:(NSMenu *)menu forWindow:(NSWindow *)window
 {
     NSUInteger index = [self indexForWindow:window];
     if (menu) {
-        NSDictionary* newentry = @{@"menu":menu, @"window":window};
+        NSDictionary* newentry = [NSDictionary dictionaryWithObjectsAndKeys:menu, @"menu", window, @"window", nil];
         if (index == NSNotFound) {
             [self->_items addObject: newentry];
         }

src/macosx/osxgl.m

@@ -667,7 +667,7 @@ -(void) finishExitingFullScreenWindowMode
 /* set_current_display:
 * Set the current windowed display to be current.
 */
-bool set_current_display(ALLEGRO_DISPLAY* d) {
+static bool set_current_display(ALLEGRO_DISPLAY* d) {
    ALLEGRO_DISPLAY_OSX_WIN* dpy = (ALLEGRO_DISPLAY_OSX_WIN*) d;
    if (dpy->ctx != nil) {
       [dpy->ctx makeCurrentContext];
@@ -2191,7 +2191,8 @@ static bool set_display_flag(ALLEGRO_DISPLAY *display, int flag, bool onoff)
    if (!win)
       return false;
 
-   @autoreleasepool {
+   {
+      NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
       switch (flag) {
          case ALLEGRO_FRAMELESS: {
             if (onoff)
@@ -2269,6 +2270,7 @@ static bool set_display_flag(ALLEGRO_DISPLAY *display, int flag, bool onoff)
             return true;
          }
       }
+      [pool release];
    }
 
    return false;