Commit a5745d26 authored by Aaron R. Larson's avatar Aaron R. Larson
Browse files

Eliminate most compiler redifintion warnings for "_" (#519254).

svn path=/trunk/; revision=3470
parent 9d966059
2008-03-22 Aaron Larson <alarson@aaron2>
* Eliminate most compiler redifintion warnings for "_" (#519254).
2008-03-22 Aaron Larson <alarson@aaron2>
* configure.in: Resolved autogen.sh build failure from #398103.
......
// I18n.h
//
// Copyright (c) 2007 The Dasher Team
// Copyright (c) 2008 The Dasher Team
//
// This file is part of Dasher.
//
......@@ -28,8 +28,12 @@
#else
#include <libintl.h>
// Attempt to get rid of '"_" rededined' compiler warnings. I'm not sure the
// proper way to verify that gnome i18n support is present, so if you have a
// better idea...
#ifndef _
#define _(szText) gettext(szText)
#endif
#endif
#endif
......@@ -12,7 +12,7 @@
#include <pthread.h>
#include <libintl.h>
#define _(_x) gettext(_x)
#include "../Common/I18n.h"
using namespace Dasher;
......
// module_settings_window.cpp
//
// Copyright (c) 2007 The Dasher Team
// Copyright (c) 2008 The Dasher Team
//
// This file is part of Dasher.
//
......@@ -18,10 +18,11 @@
// along with Dasher; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "module_settings_window.h"
#include "config.h"
#include <glib/gi18n.h>
#include "module_settings_window.h"
typedef struct _ModuleSettingsData ModuleSettingsData;
struct _ModuleSettingsData {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment