[Gnash-commit] gnash ChangeLog utilities/dumpshm.cpp utilities...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/09/05 01:51:33

Modified files:
        .              : ChangeLog 
        utilities      : dumpshm.cpp parser.cpp processor.cpp 

Log message:
        #ifdef ENABLE_NLS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4224&r2=1.4225
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/dumpshm.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.61&r2=1.62

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4224
retrieving revision 1.4225
diff -u -b -r1.4224 -r1.4225
--- ChangeLog   5 Sep 2007 01:41:24 -0000       1.4224
+++ ChangeLog   5 Sep 2007 01:51:32 -0000       1.4225
@@ -4,6 +4,7 @@
        * libbase/timer.cpp: Added commentary.
        * backend/sound_handler_sdl.cpp: Fixed conflict with namespaces from
         booost/cstdint.hpp.
+       * utilities/*.cpp: #ifdef ENABLE_NLS.
 
 2007-09-04 Sandro Santilli <address@hidden>
 

Index: utilities/dumpshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/dumpshm.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- utilities/dumpshm.cpp       10 Aug 2007 14:06:36 -0000      1.13
+++ utilities/dumpshm.cpp       5 Sep 2007 01:51:32 -0000       1.14
@@ -20,7 +20,7 @@
 //
 
 
-/* $Id: dumpshm.cpp,v 1.13 2007/08/10 14:06:36 strk Exp $ */
+/* $Id: dumpshm.cpp,v 1.14 2007/09/05 01:51:32 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -62,6 +62,10 @@
 #endif
 #include <cstdio>
 
+#ifdef ENABLE_NLS
+#include <locale.h>
+#endif
+
 #include "log.h"
 #include "rc.h"
 #include "shm.h"
@@ -100,10 +104,11 @@
 // #endif
 
     // Enable native language support, i.e. internationalization
+#ifdef ENABLE_NLS
     setlocale (LC_MESSAGES, "");
     bindtextdomain (PACKAGE, LOCALEDIR);
     textdomain (PACKAGE);
-
+#endif
     /* This initializes the DBG_MSG macros */ 
     while ((c = getopt (argc, argv, "hdnl:if")) != -1) {
         switch (c) {

Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- utilities/parser.cpp        27 Aug 2007 12:44:29 -0000      1.42
+++ utilities/parser.cpp        5 Sep 2007 01:51:32 -0000       1.43
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: parser.cpp,v 1.42 2007/08/27 12:44:29 strk Exp $ */
+/* $Id: parser.cpp,v 1.43 2007/09/05 01:51:32 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -36,6 +36,10 @@
 #endif
 }
 
+#ifdef ENABLE_NLS
+#include <locale.h>
+#endif
+
 #include "gettext.h"
 #include "tu_file.h"
 #include "zlib_adapter.h"
@@ -610,10 +614,11 @@
     int c;
 
     // Enable native language support, i.e. internationalization
+#ifdef ENABLE_NLS
     setlocale (LC_MESSAGES, "");
     bindtextdomain (PACKAGE, LOCALEDIR);
     textdomain (PACKAGE);
-
+#endif
     // scan for the two main standard GNU options
     for (c = 0; c < argc; c++) {
        if (strcmp("--help", argv[c]) == 0) {

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- utilities/processor.cpp     1 Jul 2007 10:55:16 -0000       1.61
+++ utilities/processor.cpp     5 Sep 2007 01:51:32 -0000       1.62
@@ -25,6 +25,10 @@
 #include <sys/time.h>
 #include <time.h>
 
+#ifdef ENABLE_NLS
+#include <locale.h>
+#endif
+
 #include "gettext.h"
 #include "tu_file.h"
 #include "container.h"
@@ -138,10 +142,11 @@
     gnashInit();
 
     // Enable native language support, i.e. internationalization
+#ifdef ENABLE_NLS
     setlocale (LC_MESSAGES, "");
     bindtextdomain (PACKAGE, LOCALEDIR);
     textdomain (PACKAGE);
-
+#endif
     int c;
 
     // scan for the two main standard GNU options