From a4f36118dc3781fcee3e633d2db99127de919c68 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Fri, 18 Nov 2011 04:46:20 +0000
Subject: DFNet for Mac OS X. Note that DFNet is disabled by default, and there
 are still a few rough edges.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72400 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 plugins/dfnet/dfnet.h | 22 ++++++++++++++++++++++
 plugins/dfnet/unix.c  | 45 ++++++++++++++++++++++++---------------------
 2 files changed, 46 insertions(+), 21 deletions(-)

(limited to 'plugins')

diff --git a/plugins/dfnet/dfnet.h b/plugins/dfnet/dfnet.h
index d83cb3bb..bcf4b56e 100644
--- a/plugins/dfnet/dfnet.h
+++ b/plugins/dfnet/dfnet.h
@@ -23,6 +23,28 @@
 #include <locale.h>
 #define _(x)  gettext(x)
 #define N_(x) (x)
+#elif defined(__MACOSX__)	
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef PCSXRCORE
+extern char* Pcsxr_locale_text(char* toloc);
+#define _(String) Pcsxr_locale_text(String)
+#define N_(String) String
+#else
+#ifndef PCSXRPLUG
+#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
+extern char* PLUGLOC(char* toloc);
+#define _(String) PLUGLOC(String)
+#define N_(String) String
+#endif
+#ifdef __cplusplus
+}
+#endif
 #else
 #define _(x)  (x)
 #define N_(x) (x)
diff --git a/plugins/dfnet/unix.c b/plugins/dfnet/unix.c
index 50c00269..ad3a1d0f 100644
--- a/plugins/dfnet/unix.c
+++ b/plugins/dfnet/unix.c
@@ -34,19 +34,6 @@ int ExecCfg(const char *arg, int f) {
 	return system(cfg);
 }
 
-void SysMessage(const char *fmt, ...) {
-	va_list list;
-	char msg[512];
-	char cmd[512];
-
-	va_start(list, fmt);
-	vsprintf(msg, fmt, list);
-	va_end(list);
-
-	sprintf(cmd, "message %s\n", msg);
-	ExecCfg(cmd, 1);
-}
-
 long sockInit() {
 	conf.PlayerNum = 0;
 	tm.tv_sec = 0;
@@ -59,14 +46,6 @@ long sockShutdown() {
 	return 0;
 }
 
-long sockOpen() {
-	if (ExecCfg("open", 0) == 0) return -1;
-
-	LoadConf();
-
-	return 0;
-}
-
 int sockPing() {
 	char data[32];
 	struct timeval tv, tvn;
@@ -82,6 +61,29 @@ int sockPing() {
 		   (tvn.tv_usec - tv.tv_usec) / 1000;
 }
 
+#ifndef _MACOSX
+void SysMessage(const char *fmt, ...) {
+	va_list list;
+	char msg[512];
+	char cmd[512];
+
+	va_start(list, fmt);
+	vsprintf(msg, fmt, list);
+	va_end(list);
+
+	sprintf(cmd, "message %s\n", msg);
+	ExecCfg(cmd, 1);
+}
+
+
+long sockOpen() {
+	if (ExecCfg("open", 0) == 0) return -1;
+
+	LoadConf();
+
+	return 0;
+}
+
 void CALLBACK NETconfigure() {
 	ExecCfg("configure", 1);
 }
@@ -116,6 +118,7 @@ void sockDestroyWaitDlg() {
 		cfgpid = 0;
 	}
 }
+#endif
 
 long timeGetTime() {
 	struct timeval tv;
-- 
cgit v1.2.3