From a602f4591fefa9e560a49395c9d4a7a6a126a4c5 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Sun, 23 Sep 2012 21:28:57 +0000 Subject: Quieting a warning in OS X localization implementation. Fixing a few bugs on the OS X Software Shader support, and adding a quality selector. Changing the hacks type used in the Mac preference selector from unsigned long to unsigned int. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@79982 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/dfcdrom/cdr.h | 4 ++-- plugins/dfinput/pad.h | 4 ++-- plugins/dfnet/dfnet.h | 4 ++-- plugins/dfxvideo/gpu.c | 2 +- plugins/peopsxgl/gpu.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'plugins') diff --git a/plugins/dfcdrom/cdr.h b/plugins/dfcdrom/cdr.h index 66847b36..580597e8 100644 --- a/plugins/dfcdrom/cdr.h +++ b/plugins/dfcdrom/cdr.h @@ -36,7 +36,7 @@ extern "C" { #endif #ifdef PCSXRCORE -extern char* Pcsxr_locale_text(char* toloc); +extern const char* Pcsxr_locale_text(char* toloc); #define _(String) Pcsxr_locale_text(String) #define N_(String) String #else @@ -49,7 +49,7 @@ 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) -extern char* PLUGLOC(char* toloc); +extern const char* PLUGLOC(char* toloc); #define _(String) PLUGLOC(String) #define N_(String) String #endif diff --git a/plugins/dfinput/pad.h b/plugins/dfinput/pad.h index c624d0b2..0157921c 100644 --- a/plugins/dfinput/pad.h +++ b/plugins/dfinput/pad.h @@ -61,7 +61,7 @@ typedef void *Display; //If running under Mac OS X, use the Localizable.strings file instead. #elif defined(_MACOSX) #ifdef PCSXRCORE -extern char* Pcsxr_locale_text(char* toloc); +extern const char* Pcsxr_locale_text(char* toloc); #define _(String) Pcsxr_locale_text(String) #define N_(String) String #else @@ -74,7 +74,7 @@ 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) -extern char* PLUGLOC(char* toloc); +extern const char* PLUGLOC(char* toloc); #define _(String) PLUGLOC(String) #define N_(String) String #endif diff --git a/plugins/dfnet/dfnet.h b/plugins/dfnet/dfnet.h index ef96ecae..b2c49968 100644 --- a/plugins/dfnet/dfnet.h +++ b/plugins/dfnet/dfnet.h @@ -28,7 +28,7 @@ extern "C" { #endif #ifdef PCSXRCORE -extern char* Pcsxr_locale_text(char* toloc); +extern const char* Pcsxr_locale_text(char* toloc); #define _(String) Pcsxr_locale_text(String) #define N_(String) String #else @@ -41,7 +41,7 @@ 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) -extern char* PLUGLOC(char* toloc); +extern const char* PLUGLOC(char* toloc); #define _(String) PLUGLOC(String) #define N_(String) String #endif diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c index 80b87f49..d2e24bee 100644 --- a/plugins/dfxvideo/gpu.c +++ b/plugins/dfxvideo/gpu.c @@ -55,7 +55,7 @@ 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) -extern char* PLUGLOC(char* toloc); +extern const char* PLUGLOC(char* toloc); #define _(String) PLUGLOC(String) #define N_(String) String #endif diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c index 43d26227..61daa891 100644 --- a/plugins/peopsxgl/gpu.c +++ b/plugins/peopsxgl/gpu.c @@ -59,7 +59,7 @@ static int iOldMode=0; #define N_(x) (x) #elif defined(_MACOSX) #ifdef PCSXRCORE -extern char* Pcsxr_locale_text(char* toloc); +extern const char* Pcsxr_locale_text(char* toloc); #define _(String) Pcsxr_locale_text(String) #define N_(String) String #else @@ -72,7 +72,7 @@ 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) -extern char* PLUGLOC(char* toloc); +extern const char* PLUGLOC(char* toloc); #define _(String) PLUGLOC(String) #define N_(String) String #endif -- cgit v1.2.3