[Gnash-commit] /srv/bzr/gnash/trunk r11536: Use standard <clocale> in favor of <locale>

[Markus Gothe]

------------------------------------------------------------
revno: 11536
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Fri 2009-10-02 01:46:57 +0200
message:
  Use standard <clocale> in favor of <locale>
modified:
  cygnal/cvm.cpp
  cygnal/cygnal.cpp
  gui/gnash.cpp
  libcore/as_value.cpp
  libcore/asobj/String_as.cpp
  libcore/vm/ASHandlers.cpp
  utilities/dumpshm.cpp
  utilities/flvdumper.cpp
  utilities/processor.cpp
  utilities/rtmpget.cpp
  utilities/soldumper.cpp

=== modified file 'cygnal/cvm.cpp'
--- a/cygnal/cvm.cpp    2009-09-21 02:56:49 +0000
+++ b/cygnal/cvm.cpp    2009-10-01 23:46:57 +0000
@@ -34,7 +34,7 @@
 #include <ctime>
 
 #ifdef ENABLE_NLS
-#include <locale>
+#include <clocale>
 #endif
 
 #include "gettext.h"

=== modified file 'cygnal/cygnal.cpp'
--- a/cygnal/cygnal.cpp 2009-09-21 02:56:49 +0000
+++ b/cygnal/cygnal.cpp 2009-10-01 23:46:57 +0000
@@ -82,7 +82,7 @@
 #include "cygnal.h"
 
 #ifdef ENABLE_NLS
-#include <locale.h>
+#include <clocale>>
 #endif
 
 #include <boost/date_time/gregorian/gregorian.hpp>

=== modified file 'gui/gnash.cpp'
--- a/gui/gnash.cpp     2009-04-14 18:44:33 +0000
+++ b/gui/gnash.cpp     2009-10-01 23:46:57 +0000
@@ -51,7 +51,7 @@
 #include <ios>
 
 #ifdef ENABLE_NLS
-# include <locale>
+# include <clocale>
 #endif
 
 #ifdef GUI_ALP

=== modified file 'libcore/as_value.cpp'
--- a/libcore/as_value.cpp      2009-08-21 06:51:20 +0000
+++ b/libcore/as_value.cpp      2009-10-01 23:46:57 +0000
@@ -46,7 +46,7 @@
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
-#include <locale>
+#include <clocale>
 #include <sstream>
 #include <iomanip>
 #include <string>

=== modified file 'libcore/asobj/String_as.cpp'
--- a/libcore/asobj/String_as.cpp       2009-09-29 14:00:27 +0000
+++ b/libcore/asobj/String_as.cpp       2009-10-01 23:46:57 +0000
@@ -42,7 +42,7 @@
 
 #include <boost/algorithm/string/case_conv.hpp>
 #include <algorithm>
-#include <locale>
+#include <clocale>
 #include <stdexcept>
 
 namespace gnash {

=== modified file 'libcore/vm/ASHandlers.cpp'
--- a/libcore/vm/ASHandlers.cpp 2009-09-29 13:33:38 +0000
+++ b/libcore/vm/ASHandlers.cpp 2009-10-01 23:46:57 +0000
@@ -52,7 +52,7 @@
 
 #include <string>
 #include <vector>
-#include <locale>
+#include <clocale>
 #include <cstdlib> // std::mbstowcs
 #include <boost/scoped_array.hpp>
 #include <boost/random.hpp>

=== modified file 'utilities/dumpshm.cpp'
--- a/utilities/dumpshm.cpp     2009-09-21 02:46:18 +0000
+++ b/utilities/dumpshm.cpp     2009-10-01 23:46:57 +0000
@@ -60,7 +60,7 @@
 #include <cerrno>
 
 #ifdef ENABLE_NLS
-# include <locale>
+# include <clocale>
 #endif
 
 #include "log.h"

=== modified file 'utilities/flvdumper.cpp'
--- a/utilities/flvdumper.cpp   2009-09-21 02:46:18 +0000
+++ b/utilities/flvdumper.cpp   2009-10-01 23:46:57 +0000
@@ -31,7 +31,7 @@
 #include <vector>
 
 #ifdef ENABLE_NLS
-# include <locale>
+# include <clocale>
 #endif
 
 #include "log.h"

=== modified file 'utilities/processor.cpp'
--- a/utilities/processor.cpp   2009-09-21 02:46:18 +0000
+++ b/utilities/processor.cpp   2009-10-01 23:46:57 +0000
@@ -35,7 +35,7 @@
 #include <ctime>
 
 #ifdef ENABLE_NLS
-#include <locale>
+#include <clocale>
 #endif
 
 #include "MovieFactory.h"

=== modified file 'utilities/rtmpget.cpp'
--- a/utilities/rtmpget.cpp     2009-09-21 02:46:18 +0000
+++ b/utilities/rtmpget.cpp     2009-10-01 23:46:57 +0000
@@ -22,8 +22,6 @@
 #include "gnashconfig.h"
 #endif
 
-#include "gettext.h"
-
 // classes internal to Gnash
 #include "gnash.h"
 #include "network.h"
@@ -43,12 +41,8 @@
 #include "element.h"
 #include "URL.h"
 
-// classes internal to Cygnal
-#include "buffer.h"
-#include "handler.h"
-
 #ifdef ENABLE_NLS
-#include <locale.h>
+#include <clocale>
 #endif
 
 #include <string>
@@ -152,7 +146,7 @@
         dbglogfile.setVerbosity(rcfile.verbosityLevel());
     }    
 
-#if 0
+#if 1
     string app; // the application name
     string path; // the path to the file on the server
     string tcUrl; // the tcUrl field
@@ -408,7 +402,7 @@
 {
     cout << "rtmpget " << VERSION << endl
         << endl
-        << _("Copyright (C) 2008 Free Software Foundation, Inc.\n"
+        << _("Copyright (C) 2008, 2009 Free Software Foundation, Inc.\n"
         "Cygnal comes with NO WARRANTY, to the extent permitted by law.\n"
         "You may redistribute copies of Cygnal under the terms of the GNU 
General\n"
         "Public License.  For more information, see the file named COPYING.\n")

=== modified file 'utilities/soldumper.cpp'
--- a/utilities/soldumper.cpp   2009-09-21 02:46:18 +0000
+++ b/utilities/soldumper.cpp   2009-10-01 23:46:57 +0000
@@ -25,7 +25,7 @@
 #include <cstring>
 
 #ifdef ENABLE_NLS
-# include <locale>
+# include <clocale>
 #endif
 
 extern "C"{