From dd7da2fae96b9ba6bdbc28f7b26469373801f21e Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Thu, 4 Jul 2013 03:07:44 +0000
Subject: Make the plug-ins use ARC in 64-bit mode. Change how the preprocessor
 macros are managed on OS X. Set the name of the product to the target name.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85795 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/plugins/DFInput/macsrc/ControllerList.m | 2 ++
 macosx/plugins/DFInput/macsrc/PadController.m  | 8 +++++---
 macosx/plugins/DFInput/macsrc/PadView.m        | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'macosx/plugins/DFInput/macsrc')

diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.m b/macosx/plugins/DFInput/macsrc/ControllerList.m
index 3a6ec11c..609af2e2 100755
--- a/macosx/plugins/DFInput/macsrc/ControllerList.m
+++ b/macosx/plugins/DFInput/macsrc/ControllerList.m
@@ -33,10 +33,12 @@ static int currentController;
 	return self;
 }
 
+#if !__has_feature(objc_arc)
 - (void)dealloc
 {
 	[super dealloc];
 }
+#endif
 
 /* sets current controller data returned by data source */
 + (void)setCurrentController:(int)which
diff --git a/macosx/plugins/DFInput/macsrc/PadController.m b/macosx/plugins/DFInput/macsrc/PadController.m
index 2cc01b7d..e2b28ea9 100755
--- a/macosx/plugins/DFInput/macsrc/PadController.m
+++ b/macosx/plugins/DFInput/macsrc/PadController.m
@@ -22,6 +22,7 @@
 #import <Cocoa/Cocoa.h>
 #import "PadController.h"
 #include "pad.h"
+#import "ARCBridge.h"
 
 static NSWindow *padWindow = nil;
 static PadController *padController = nil;
@@ -37,10 +38,11 @@ void DoAbout() {
 	NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
 	NSAttributedString *credits;
 	if (path) {
-		credits = [[[NSAttributedString alloc] initWithPath: path
-				documentAttributes:NULL] autorelease];
+		credits = [[NSAttributedString alloc] initWithPath: path
+				documentAttributes:NULL];
+		AUTORELEASEOBJNORETURN(credits);
 	} else {
-		credits = [[[NSAttributedString alloc] initWithString:@""] autorelease];
+		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]);
 	}
 
 	// Get Application Icon
diff --git a/macosx/plugins/DFInput/macsrc/PadView.m b/macosx/plugins/DFInput/macsrc/PadView.m
index f9da9f09..ea81f9ac 100755
--- a/macosx/plugins/DFInput/macsrc/PadView.m
+++ b/macosx/plugins/DFInput/macsrc/PadView.m
@@ -33,11 +33,13 @@
 	return self;
 }
 
+#if !__has_feature(objc_arc)
 - (void)dealloc
 {
 	[controller release];
 	[super dealloc];
 }
+#endif
 
 - (void)drawRect:(NSRect)rect
 {
-- 
cgit v1.2.3