From 83044f740ab7252cb02b7b5a619688ab4c2248b6 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Fri, 18 Nov 2011 23:58:37 +0000 Subject: Adding a kludge around defines to get each plug-in to have a unique localization function on Mac OS X. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72452 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/dfnet/dfnet.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'plugins/dfnet') diff --git a/plugins/dfnet/dfnet.h b/plugins/dfnet/dfnet.h index bcf4b56e..ef96ecae 100644 --- a/plugins/dfnet/dfnet.h +++ b/plugins/dfnet/dfnet.h @@ -23,7 +23,7 @@ #include #define _(x) gettext(x) #define N_(x) (x) -#elif defined(__MACOSX__) +#elif defined(_MACOSX) #ifdef __cplusplus extern "C" { #endif @@ -36,8 +36,11 @@ extern char* Pcsxr_locale_text(char* toloc); #warning please define the plug being built to use Mac OS X localization! #define _(msgid) msgid #define N_(msgid) msgid -#endif -#define PLUGLOC PCSXRPLUG##_locale_text +#else +//Kludge to get the preprocessor to accept PCSXRPLUG as a variable. +#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); #define _(String) PLUGLOC(String) #define N_(String) String @@ -45,6 +48,7 @@ extern char* PLUGLOC(char* toloc); #ifdef __cplusplus } #endif +#endif #else #define _(x) (x) #define N_(x) (x) -- cgit v1.2.3