[Wesnoth-cvs-commits] wesnoth/src language.cpp

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/09/11 21:58:01

Modified files:
        src            : language.cpp 

Log message:
        bracket the BeOS hack with #ifdef

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.cpp.diff?tr1=1.46&tr2=1.47&r1=text&r2=text

Patches:
Index: wesnoth/src/language.cpp
diff -u wesnoth/src/language.cpp:1.46 wesnoth/src/language.cpp:1.47
--- wesnoth/src/language.cpp:1.46       Sat Sep 11 20:39:51 2004
+++ wesnoth/src/language.cpp    Sat Sep 11 21:58:01 2004
@@ -1,4 +1,4 @@
-/* $Id: language.cpp,v 1.46 2004/09/11 20:39:51 ydirson Exp $ */
+/* $Id: language.cpp,v 1.47 2004/09/11 21:58:01 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -104,16 +104,14 @@
        return res;
 }
 
-// This solely exist to work around problems in the BeOS port.
-// I don't put an #ifdef yet to see first whether it fixes other
-// problems, like the MacOS-X ones.
 char* wesnoth_setlocale(int category, const char *locale)
 {
+#ifdef __BEOS__
        if(setenv ("LANG", locale, 1) == -1)
                std::cerr << "setenv LANG failed: " << strerror(errno);
        if(setenv ("LC_ALL", locale, 1) == -1)
                std::cerr << "setenv LC_ALL failed: " << strerror(errno);
-
+#endif
 #ifdef __APPLE__
        if(setenv ("LANGUAGE", locale, 1) == -1)
                std::cerr << "setenv LANGUAGE failed: " << strerror(errno);