xavi
/
pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

OS X: Minor changes 

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@90493 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\MaddTheSane_cp 2014-05-22 04:24:14 +00:00
parent af7eea9751
commit bc9abb12a5
17 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libpcsxcore/psxcommon.h
View File

@ -92,7 +92,7 @@ typedef uint8_t boolean;
//If running under Mac OS X, use the Localizable.strings file instead.
#elif defined(_MACOSX)
#ifdef PCSXRCORE
__private_extern__ char* Pcsxr_locale_text(char* toloc);
__private_extern char* Pcsxr_locale_text(char* toloc);
#define _(String) Pcsxr_locale_text(String)
#define N_(String) String
#else
@ -105,7 +105,7 @@ __private_extern__ char* Pcsxr_locale_text(char* toloc);
#define PLUGLOC_x(x,y) x ## y
#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
__private_extern__ char* PLUGLOC(char* toloc);
__private_extern char* PLUGLOC(char* toloc);
#define _(String) PLUGLOC(String)
#define N_(String) String
#endif

10
macosx/Pcsxr-QL/MyQuickLook.h
View File

@ -16,14 +16,14 @@
// Apple deprecated __private_extern__ in Xcode 4.6.
// This is a convenience declaration to retain the old behavior.
#define __private_extern__ __attribute__((visibility("hidden")))
#define __private_extern __attribute__((visibility("hidden")))
// The thumbnail generation function to be implemented in GenerateThumbnailForURL.c
__private_extern__ OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thumbnail, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options, CGSize maxSize);
__private_extern__ void CancelThumbnailGeneration(void* thisInterface, QLThumbnailRequestRef thumbnail);
__private_extern OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thumbnail, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options, CGSize maxSize);
__private_extern void CancelThumbnailGeneration(void* thisInterface, QLThumbnailRequestRef thumbnail);
// The preview generation function to be implemented in GeneratePreviewForURL.c
__private_extern__ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options);
__private_extern__ void CancelPreviewGeneration(void *thisInterface, QLPreviewRequestRef preview);
__private_extern OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options);
__private_extern void CancelPreviewGeneration(void *thisInterface, QLPreviewRequestRef preview);
#endif

2
macosx/PcsxrController.h
View File

@ -8,7 +8,7 @@
@class ConfigurationController;
@class CheatController;
__private_extern__ void ShowHelpAndExit(FILE* output, int exitCode);
__private_extern void ShowHelpAndExit(FILE* output, int exitCode);
extern BOOL wasFinderLaunch;
@interface PcsxrController : NSObject <NSApplicationDelegate>

4
macosx/PcsxrMemoryObject.h
View File

@ -11,13 +11,13 @@
extern NSString *const memoryAnimateTimerKey;
typedef enum _PCSXRMemFlags {
typedef NS_ENUM(char, PCSXRMemFlags) {
memFlagDeleted,
memFlagFree,
memFlagUsed,
memFlagLink,
memFlagEndLink
} PCSXRMemFlags;
};
@interface PcsxrMemoryObject : NSObject

4
macosx/PcsxrMemoryObject.m
View File

@ -30,7 +30,7 @@ NSString *const memoryAnimateTimerKey = @"PCSXR Memory Card Image Animate";
{
NSMutableArray *imagesArray = [[NSMutableArray alloc] initWithCapacity:block->IconCount];
for (int i = 0; i < block->IconCount; i++) {
NSImage *memImage = nil;
NSImage *memImage;
{
NSBitmapImageRep *imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:16 pixelsHigh:16 bitsPerSample:8 samplesPerPixel:3 hasAlpha:NO isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace bytesPerRow:0 bitsPerPixel:0];
@ -201,7 +201,7 @@ static NSString *MemLabelEndLink;
@synthesize blockSize;
@synthesize startingIndex;
#pragma mark Non-synthesize Properties
#pragma mark Non-synthesized Properties
- (unsigned)memIconCount
{
return (unsigned)[memImages count];

2
macosx/pcsxr.pch
View File

@ -11,7 +11,7 @@
// Apple deprecated __private_extern__ in Xcode 4.6.
// This is a convenience declaration to retain the old behavior.
#define __private_extern__ __attribute__((visibility("hidden")))
#define __private_extern __attribute__((visibility("hidden")))
#include <sys/time.h>
#include <unistd.h>

6
macosx/plugins/DFInput/macsrc/PadController.h
View File

@ -35,6 +35,6 @@
- (IBAction)ok:(id)sender;
@end
__private_extern__ NSDictionary *DefaultPadArray(int padnum);
__private_extern__ void LoadPadArray(int padnum, NSDictionary *nsPrefs);
__private_extern__ NSDictionary *SavePadArray(int padnum);
__private_extern NSDictionary *DefaultPadArray(int padnum);
__private_extern void LoadPadArray(int padnum, NSDictionary *nsPrefs);
__private_extern NSDictionary *SavePadArray(int padnum);

4
macosx/plugins/DFSound/macsrc/PluginController.m
View File

@ -11,7 +11,7 @@
//If running under Mac OS X, use the Localizable.strings file instead.
#elif defined(_MACOSX)
#ifdef PCSXRCORE
__private_extern__ char* Pcsxr_locale_text(char* toloc);
__private_extern char* Pcsxr_locale_text(char* toloc);
#define _(String) Pcsxr_locale_text(String)
#define N_(String) String
#else
@ -24,7 +24,7 @@ __private_extern__ char* Pcsxr_locale_text(char* toloc);
#define PLUGLOC_x(x,y) x ## y
#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
__private_extern__ char* PLUGLOC(char* toloc);
__private_extern char* PLUGLOC(char* toloc);
#define _(String) PLUGLOC(String)
#define N_(String) String
#endif

4
macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
View File

@ -14,7 +14,7 @@
//If running under Mac OS X, use the Localizable.strings file instead.
#elif defined(_MACOSX)
#ifdef PCSXRCORE
__private_extern__ char* Pcsxr_locale_text(char* toloc);
__private_extern char* Pcsxr_locale_text(char* toloc);
#define _(String) Pcsxr_locale_text(String)
#define N_(String) String
#else
@ -27,7 +27,7 @@ __private_extern__ char* Pcsxr_locale_text(char* toloc);
#define PLUGLOC_x(x,y) x ## y
#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
__private_extern__ char* PLUGLOC(char* toloc);
__private_extern char* PLUGLOC(char* toloc);
#define _(String) PLUGLOC(String)
#define N_(String) String
#endif

4
macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
View File

@ -21,7 +21,7 @@
//If running under Mac OS X, use the Localizable.strings file instead.
#elif defined(_MACOSX)
#ifdef PCSXRCORE
__private_extern__ char* Pcsxr_locale_text(char* toloc);
__private_extern char* Pcsxr_locale_text(char* toloc);
#define _(String) Pcsxr_locale_text(String)
#define N_(String) String
#else
@ -34,7 +34,7 @@ __private_extern__ char* Pcsxr_locale_text(char* toloc);
#define PLUGLOC_x(x,y) x ## y
#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
__private_extern__ char* PLUGLOC(char* toloc);
__private_extern char* PLUGLOC(char* toloc);
#define _(String) PLUGLOC(String)
#define N_(String) String
#endif

4
plugins/bladesio1/sio1.h
View File

@ -32,7 +32,7 @@
extern "C" {
#endif
#ifdef PCSXRCORE
__private_extern__ char* Pcsxr_locale_text(char* toloc);
__private_extern char* Pcsxr_locale_text(char* toloc);
#define _(String) Pcsxr_locale_text(String)
#define N_(String) String
#else
@ -45,7 +45,7 @@ __private_extern__ char* Pcsxr_locale_text(char* toloc);
#define PLUGLOC_x(x,y) x ## y
#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
__private_extern__ char* PLUGLOC(char* toloc);
__private_extern char* PLUGLOC(char* toloc);
#define _(String) PLUGLOC(String)
#define N_(String) String
#endif

4
plugins/dfcdrom/cdr.h
View File

@ -36,7 +36,7 @@
extern "C" {
#endif
#ifdef PCSXRCORE
__private_extern__ char* Pcsxr_locale_text(char* toloc);
__private_extern char* Pcsxr_locale_text(char* toloc);
#define _(String) Pcsxr_locale_text(String)
#define N_(String) String
#else
@ -49,7 +49,7 @@ __private_extern__ char* Pcsxr_locale_text(char* toloc);
#define PLUGLOC_x(x,y) x ## y
#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
__private_extern__ char* PLUGLOC(char* toloc);
__private_extern char* PLUGLOC(char* toloc);
#define _(String) PLUGLOC(String)
#define N_(String) String
#endif

4
plugins/dfinput/pad.h
View File

@ -62,7 +62,7 @@ typedef void *Display;
//If running under Mac OS X, use the Localizable.strings file instead.
#elif defined(_MACOSX)
#ifdef PCSXRCORE
__private_extern__ char* Pcsxr_locale_text(char* toloc);
__private_extern char* Pcsxr_locale_text(char* toloc);
#define _(String) Pcsxr_locale_text(String)
#define N_(String) String
#else
@ -75,7 +75,7 @@ __private_extern__ char* Pcsxr_locale_text(char* toloc);
#define PLUGLOC_x(x,y) x ## y
#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
__private_extern__ char* PLUGLOC(char* toloc);
__private_extern char* PLUGLOC(char* toloc);
#define _(String) PLUGLOC(String)
#define N_(String) String
#endif

4
plugins/dfnet/dfnet.h
View File

@ -28,7 +28,7 @@
extern "C" {
#endif
#ifdef PCSXRCORE
__private_extern__ char* Pcsxr_locale_text(char* toloc);
__private_extern char* Pcsxr_locale_text(char* toloc);
#define _(String) Pcsxr_locale_text(String)
#define N_(String) String
#else
@ -41,7 +41,7 @@ __private_extern__ char* Pcsxr_locale_text(char* toloc);
#define PLUGLOC_x(x,y) x ## y
#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
__private_extern__ char* PLUGLOC(char* toloc);
__private_extern char* PLUGLOC(char* toloc);
#define _(String) PLUGLOC(String)
#define N_(String) String
#endif

4
plugins/dfsound/spu.c
View File

@ -39,7 +39,7 @@
//If running under Mac OS X, use the Localizable.strings file instead.
#elif defined(_MACOSX)
#ifdef PCSXRCORE
__private_extern__ char* Pcsxr_locale_text(char* toloc);
__private_extern char* Pcsxr_locale_text(char* toloc);
#define _(String) Pcsxr_locale_text(String)
#define N_(String) String
#else
@ -52,7 +52,7 @@ __private_extern__ char* Pcsxr_locale_text(char* toloc);
#define PLUGLOC_x(x,y) x ## y
#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
__private_extern__ char* PLUGLOC(char* toloc);
__private_extern char* PLUGLOC(char* toloc);
#define _(String) PLUGLOC(String)
#define N_(String) String
#endif

4
plugins/dfxvideo/gpu.c
View File

@ -42,7 +42,7 @@
//If running under Mac OS X, use the Localizable.strings file instead.
#elif defined(_MACOSX)
#ifdef PCSXRCORE
__private_extern__ char* Pcsxr_locale_text(char* toloc);
__private_extern char* Pcsxr_locale_text(char* toloc);
#define _(String) Pcsxr_locale_text(String)
#define N_(String) String
#else
@ -55,7 +55,7 @@ __private_extern__ char* Pcsxr_locale_text(char* toloc);
#define PLUGLOC_x(x,y) x ## y
#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
__private_extern__ char* PLUGLOC(char* toloc);
__private_extern char* PLUGLOC(char* toloc);
#define _(String) PLUGLOC(String)
#define N_(String) String
#endif

4
plugins/peopsxgl/gpu.c
View File

@ -59,7 +59,7 @@ static int iOldMode=0;
#define N_(x) (x)
#elif defined(_MACOSX)
#ifdef PCSXRCORE
__private_extern__ char* Pcsxr_locale_text(char* toloc);
__private_extern char* Pcsxr_locale_text(char* toloc);
#define _(String) Pcsxr_locale_text(String)
#define N_(String) String
#else
@ -72,7 +72,7 @@ __private_extern__ char* Pcsxr_locale_text(char* toloc);
#define PLUGLOC_x(x,y) x ## y
#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
__private_extern__ char* PLUGLOC(char* toloc);
__private_extern char* PLUGLOC(char* toloc);
#define _(String) PLUGLOC(String)
#define N_(String) String
#endif