From f902b4a3c13d1502bec17754f15fce03a21c5aaa Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 27 Jun 2011 05:11:15 +0300
Subject: Fix errors in MacOS compilation.

---
 src/event.h         |  4 ++--
 src/gui/sdlfont.h   |  4 ----
 src/log.cpp         | 18 +++++++++---------
 src/utils/gettext.h |  9 +++++++++
 4 files changed, 20 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/event.h b/src/event.h
index 8634a654c..9ff02f3d0 100644
--- a/src/event.h
+++ b/src/event.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EVENT_H
-#define EVENT_H
+#ifndef MANA_EVENT_H
+#define MANA_EVENT_H
 
 #include <map>
 #include <set>
diff --git a/src/gui/sdlfont.h b/src/gui/sdlfont.h
index 86ef2f1e9..e0aac7785 100644
--- a/src/gui/sdlfont.h
+++ b/src/gui/sdlfont.h
@@ -26,15 +26,11 @@
 
 #include <guichan/font.hpp>
 
-#ifdef __APPLE__
-#include <SDL_ttf/SDL_ttf.h>
-#else
 #ifdef __WIN32__
 #include <SDL/SDL_ttf.h>
 #else
 #include <SDL_ttf.h>
 #endif
-#endif
 
 #include <list>
 #include <string>
diff --git a/src/log.cpp b/src/log.cpp
index cd0814f54..9bcf1ea4f 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -197,15 +197,15 @@ void Logger::error(const std::string &error_text)
 #ifdef WIN32
     MessageBox(NULL, error_text.c_str(), "Error", MB_ICONERROR | MB_OK);
 #elif defined __APPLE__
-    Str255 msg;
-    CFStringRef error;
-    error = CFStringCreateWithCString(NULL,
-                                      error_text.c_str(),
-                                      kCFStringEncodingMacRoman);
-    CFStringGetPascalString(error, msg, 255, kCFStringEncodingMacRoman);
-    StandardAlert(kAlertStopAlert,
-                  "\pError",
-                  (ConstStr255Param) msg, NULL, NULL);
+//    Str255 msg;
+//    CFStringRef error;
+//    error = CFStringCreateWithCString(NULL,
+//                                      error_text.c_str(),
+//                                      kCFStringEncodingMacRoman);
+//    CFStringGetPascalString(error, msg, 255, kCFStringEncodingMacRoman);
+//    StandardAlert(kAlertStopAlert,
+//                  (const unsigned char*)"\pError",
+//                  (ConstStr255Param) msg, NULL, NULL);
 #elif defined __linux__ || __linux
     std::cerr << "Error: " << error_text << std::endl;
     std::string msg = "xmessage \"" + error_text + "\"";
diff --git a/src/utils/gettext.h b/src/utils/gettext.h
index fa9a62a6d..0a15aa724 100644
--- a/src/utils/gettext.h
+++ b/src/utils/gettext.h
@@ -40,6 +40,15 @@
 #define _(s) (const_cast <char*>(s))
 #define N_(s) (const_cast <char*>(s))
 
+char* ngettext(char* msgid, char* msgid_plural, unsigned long int n);
+
+char* ngettext(char* msgid, char* msgid_plural, unsigned long int n)
+{
+    if(n > 1)
+        return msgid_plural;
+    return msgid;
+}
+
 #endif
 
 #endif // UTILS_GETTEXT_H
-- 
cgit v1.2.3-70-g09d2