summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-08-06 11:14:45 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-08-06 11:14:45 +0000
commit1389fc06cc578bdddd6d92cf3a239e33bb892026 (patch)
tree951df53f84f575bf1ff0a0ae57c06b04d9522f82 /src/utils
parent0bd2a74378b01204876ec8d92c03959f3b3a287e (diff)
downloadMana-1389fc06cc578bdddd6d92cf3a239e33bb892026.tar.gz
Mana-1389fc06cc578bdddd6d92cf3a239e33bb892026.tar.bz2
Mana-1389fc06cc578bdddd6d92cf3a239e33bb892026.tar.xz
Mana-1389fc06cc578bdddd6d92cf3a239e33bb892026.zip
Fixed some header typos. Moved gettext.h to utils directory. Removed redundant HAS_CONFIG_H macro. Used autopoint for generating gettext environment. Removed auto-generated file from po directory.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/gettext.h46
-rw-r--r--src/utils/strprintf.h2
-rw-r--r--src/utils/tostring.h2
3 files changed, 48 insertions, 2 deletions
diff --git a/src/utils/gettext.h b/src/utils/gettext.h
new file mode 100644
index 00000000..72533850
--- /dev/null
+++ b/src/utils/gettext.h
@@ -0,0 +1,46 @@
+/*
+ * The Mana World
+ * Copyright 2007 The Mana World Development Team
+ *
+ * This file is part of The Mana World.
+ *
+ * The Mana World is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * The Mana World is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with The Mana World; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
+ */
+
+#ifndef _TMW_UTILS_GETTEXT_H
+#define _TMW_UTILS_GETTEXT_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if ENABLE_NLS
+
+#include <libintl.h>
+
+#define _(s) ((char const *)gettext(s))
+#define N_(s) ((char const *)s)
+
+#else
+
+#define gettext(s) ((char const *)s)
+#define _(s) ((char const *)s)
+#define N_(s) ((char const *)s)
+
+#endif
+
+#endif
diff --git a/src/utils/strprintf.h b/src/utils/strprintf.h
index 4b5974a6..a1fb0f13 100644
--- a/src/utils/strprintf.h
+++ b/src/utils/strprintf.h
@@ -22,7 +22,7 @@
*/
#ifndef _TMW_UTILS_STRPRINTF_H
-#define _TMW_UTISL_STRPRINTF_H
+#define _TMW_UTILS_STRPRINTF_H
#include <string>
diff --git a/src/utils/tostring.h b/src/utils/tostring.h
index 8fc6d105..95b8985f 100644
--- a/src/utils/tostring.h
+++ b/src/utils/tostring.h
@@ -22,7 +22,7 @@
*/
#ifndef _TMW_UTILS_TOSTRING_H
-#define _TMW_UTISL_TOSTRING_H
+#define _TMW_UTILS_TOSTRING_H
#include <sstream>