[Gnash-commit] gnash ChangeLog server/action_buffer.cpp server...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/08/20 19:34:46

Modified files:
        .              : ChangeLog 
        server         : action_buffer.cpp 
        server/swf     : ASHandlers.cpp 

Log message:
        Initialise SWFHandlers::_handlers before class SWFHandlers is 
instantiated (bug #17476).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.659&r2=1.660
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action_buffer.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.52&r2=1.53

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.659
retrieving revision 1.660
diff -u -b -r1.659 -r1.660
--- ChangeLog   20 Aug 2006 13:54:22 -0000      1.659
+++ ChangeLog   20 Aug 2006 19:34:45 -0000      1.660
@@ -1,3 +1,9 @@
+2006-08-20 Bastiaan Jacques <address@hidden>
+
+       * server/{action_buffer.cpp, swf/ASHandlers.cpp}: Initialise
+       SWFHandlers::_handlers before class SWFHandlers is instantiated (bug
+       #17476).
+
 2006-08-20 Sandro Santilli  <address@hidden>
 
        * utilities/processor.cpp: fixed bug #17367

Index: server/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/action_buffer.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/action_buffer.cpp    12 Aug 2006 22:03:27 -0000      1.16
+++ server/action_buffer.cpp    20 Aug 2006 19:34:45 -0000      1.17
@@ -65,10 +65,9 @@
 namespace gnash {
 
 
-#if defined(_WIN32) || defined(WIN32)
-       SWFHandlers::container_type SWFHandlers::_handlers(255);
-       std::vector<std::string> SWFHandlers::_property_names;
-#endif
+SWFHandlers::container_type SWFHandlers::_handlers(255);
+std::vector<std::string> SWFHandlers::_property_names;
+
 
 static const SWFHandlers& ash = SWFHandlers::instance();
 

Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- server/swf/ASHandlers.cpp   20 Aug 2006 00:17:40 -0000      1.52
+++ server/swf/ASHandlers.cpp   20 Aug 2006 19:34:45 -0000      1.53
@@ -74,12 +74,6 @@
 
 namespace SWF { // gnash::SWF
 
-#if ! (defined(_WIN32) || defined(WIN32))
-       SWFHandlers::container_type SWFHandlers::_handlers(255);
-       std::vector<std::string> SWFHandlers::_property_names;
-#endif
-
-
 // Utility.  Try to convert str to a number.  If successful,
 // put the result in *result, and return true.  If not
 // successful, put 0 in *result, and return false.