gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] gnash ./ChangeLog server/ASSound.cpp server/Boo...


From: Sandro Santilli
Subject: [Gnash-commit] gnash ./ChangeLog server/ASSound.cpp server/Boo...
Date: Sat, 20 May 2006 23:49:34 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/20 23:49:33

Modified files:
        .              : ChangeLog 
        server         : ASSound.cpp Boolean.cpp Camera.cpp Color.cpp 
                         ContextMenu.cpp CustomActions.cpp Date.cpp 
                         Error.cpp Function.cpp Global.cpp Key.cpp 
                         LoadVars.cpp LocalConnection.cpp Math.cpp 
                         Microphone.cpp Mouse.cpp MovieClipLoader.cpp 
                         NetConnection.cpp NetStream.cpp Selection.cpp 
                         SharedObject.cpp Stage.cpp System.cpp 
                         TextSnapshot.cpp Video.cpp action.cpp action.h 
                         array.cpp gen-files.sh network.cpp shm.cpp 
                         sprite_instance.cpp sprite_instance.h 
                         string.cpp textformat.cpp timers.cpp xml.cpp 
                         xmlnode.cpp xmlsocket.cpp 
        server/swf     : ASHandlers.cpp 
Added files:
        server         : fn_call.h 

Log message:
        * server: action.h, fn_call.h, *: moved
        fn_call struct definition in its own file
        * server/gen-files.sh: added fn_call.h include
        in implementation file and as_object.h include
        in header file. Updated all files for new header.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.366&tr2=1.367&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/ASSound.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Boolean.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Camera.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Color.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/ContextMenu.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/CustomActions.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Date.cpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Error.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Function.cpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Global.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Key.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/LoadVars.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/LocalConnection.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Math.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Microphone.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Mouse.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/MovieClipLoader.cpp.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/NetConnection.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/NetStream.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Selection.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/SharedObject.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Stage.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/System.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/TextSnapshot.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Video.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.cpp.diff?tr1=1.77&tr2=1.78&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.h.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/array.cpp.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/fn_call.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/gen-files.sh.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/network.cpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/shm.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/sprite_instance.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/sprite_instance.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/string.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/textformat.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/timers.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xml.cpp.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlnode.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlsocket.cpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/swf/ASHandlers.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.366 gnash/ChangeLog:1.367
--- gnash/ChangeLog:1.366       Sat May 20 20:06:29 2006
+++ gnash/ChangeLog     Sat May 20 23:49:33 2006
@@ -1,3 +1,11 @@
+2006-05-21 Sandro Santilli <address@hidden>
+
+       * server: action.h, fn_call.h, *: moved
+       fn_call struct definition in its own file
+       * server/gen-files.sh: added fn_call.h include
+       in implementation file and as_object.h include
+       in header file. Updated all files for new header.
+
 2006-05-20 Vitaly Alexeev <address@hidden>
 
        * server/gnash.h: struct font; --> class font;
Index: gnash/server/ASSound.cpp
diff -u gnash/server/ASSound.cpp:1.3 gnash/server/ASSound.cpp:1.4
--- gnash/server/ASSound.cpp:1.3        Sun May  7 12:19:06 2006
+++ gnash/server/ASSound.cpp    Sat May 20 23:49:33 2006
@@ -23,6 +23,7 @@
 #include "log.h"
 #include "ASSound.h"
 #include "movie_definition.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/Boolean.cpp
diff -u gnash/server/Boolean.cpp:1.4 gnash/server/Boolean.cpp:1.5
--- gnash/server/Boolean.cpp:1.4        Mon Apr 24 23:05:56 2006
+++ gnash/server/Boolean.cpp    Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "Boolean.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/Camera.cpp
diff -u gnash/server/Camera.cpp:1.4 gnash/server/Camera.cpp:1.5
--- gnash/server/Camera.cpp:1.4 Mon Apr 24 23:05:56 2006
+++ gnash/server/Camera.cpp     Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "Camera.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/Color.cpp
diff -u gnash/server/Color.cpp:1.5 gnash/server/Color.cpp:1.6
--- gnash/server/Color.cpp:1.5  Mon Apr 24 23:05:56 2006
+++ gnash/server/Color.cpp      Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "Color.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/ContextMenu.cpp
diff -u gnash/server/ContextMenu.cpp:1.4 gnash/server/ContextMenu.cpp:1.5
--- gnash/server/ContextMenu.cpp:1.4    Mon Apr 24 23:05:56 2006
+++ gnash/server/ContextMenu.cpp        Sat May 20 23:49:33 2006
@@ -42,7 +42,7 @@
 
 #include "log.h"
 #include "ContextMenu.h"
-
+#include "fn_call.h"
 namespace gnash {
 
 ContextMenu::ContextMenu() {
Index: gnash/server/CustomActions.cpp
diff -u gnash/server/CustomActions.cpp:1.4 gnash/server/CustomActions.cpp:1.5
--- gnash/server/CustomActions.cpp:1.4  Mon Apr 24 23:05:56 2006
+++ gnash/server/CustomActions.cpp      Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "CustomActions.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/Date.cpp
diff -u gnash/server/Date.cpp:1.11 gnash/server/Date.cpp:1.12
--- gnash/server/Date.cpp:1.11  Thu May 18 19:17:07 2006
+++ gnash/server/Date.cpp       Sat May 20 23:49:33 2006
@@ -41,6 +41,8 @@
 
 #include "log.h"
 #include "Date.h"
+#include "fn_call.h"
+
 #include <time.h>
 
 #ifdef WIN32
Index: gnash/server/Error.cpp
diff -u gnash/server/Error.cpp:1.4 gnash/server/Error.cpp:1.5
--- gnash/server/Error.cpp:1.4  Mon Apr 24 23:05:56 2006
+++ gnash/server/Error.cpp      Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "Error.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/Function.cpp
diff -u gnash/server/Function.cpp:1.14 gnash/server/Function.cpp:1.15
--- gnash/server/Function.cpp:1.14      Sat Apr 29 00:56:38 2006
+++ gnash/server/Function.cpp   Sat May 20 23:49:33 2006
@@ -45,6 +45,7 @@
 #include "Function.h"
 #include "array.h"
 #include "gnash.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/Global.cpp
diff -u gnash/server/Global.cpp:1.7 gnash/server/Global.cpp:1.8
--- gnash/server/Global.cpp:1.7 Mon May  8 11:43:58 2006
+++ gnash/server/Global.cpp     Sat May 20 23:49:33 2006
@@ -50,6 +50,7 @@
 #include "textformat.h"
 #include "TextSnapshot.h"
 #include "Video.h"
+#include "fn_call.h"
 
 #ifdef HAVE_LIBXML
 #include "xml.h"
Index: gnash/server/Key.cpp
diff -u gnash/server/Key.cpp:1.2 gnash/server/Key.cpp:1.3
--- gnash/server/Key.cpp:1.2    Thu Apr 27 15:14:07 2006
+++ gnash/server/Key.cpp        Sat May 20 23:49:33 2006
@@ -23,6 +23,7 @@
 #include "log.h"
 #include "Key.h"
 #include "action.h" // for action_init
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/LoadVars.cpp
diff -u gnash/server/LoadVars.cpp:1.4 gnash/server/LoadVars.cpp:1.5
--- gnash/server/LoadVars.cpp:1.4       Mon Apr 24 23:05:56 2006
+++ gnash/server/LoadVars.cpp   Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "LoadVars.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/LocalConnection.cpp
diff -u gnash/server/LocalConnection.cpp:1.6 
gnash/server/LocalConnection.cpp:1.7
--- gnash/server/LocalConnection.cpp:1.6        Mon Apr 24 23:05:56 2006
+++ gnash/server/LocalConnection.cpp    Sat May 20 23:49:33 2006
@@ -45,6 +45,7 @@
 #include "log.h"
 #include "LocalConnection.h"
 #include "network.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/Math.cpp
diff -u gnash/server/Math.cpp:1.2 gnash/server/Math.cpp:1.3
--- gnash/server/Math.cpp:1.2   Mon May  8 21:12:24 2006
+++ gnash/server/Math.cpp       Sat May 20 23:49:33 2006
@@ -23,6 +23,7 @@
 #include "log.h"
 #include "Math.h"
 #include "tu_random.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/Microphone.cpp
diff -u gnash/server/Microphone.cpp:1.4 gnash/server/Microphone.cpp:1.5
--- gnash/server/Microphone.cpp:1.4     Mon Apr 24 23:05:56 2006
+++ gnash/server/Microphone.cpp Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "Microphone.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/Mouse.cpp
diff -u gnash/server/Mouse.cpp:1.4 gnash/server/Mouse.cpp:1.5
--- gnash/server/Mouse.cpp:1.4  Mon Apr 24 23:05:56 2006
+++ gnash/server/Mouse.cpp      Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "Mouse.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/MovieClipLoader.cpp
diff -u gnash/server/MovieClipLoader.cpp:1.21 
gnash/server/MovieClipLoader.cpp:1.22
--- gnash/server/MovieClipLoader.cpp:1.21       Tue May 16 09:09:24 2006
+++ gnash/server/MovieClipLoader.cpp    Sat May 20 23:49:33 2006
@@ -66,11 +66,12 @@
 #include "log.h"
 #include "tu_file.h"
 #include "image.h"
-#include "render.h"
-#include "impl.h"
+//#include "render.h"
+//#include "impl.h"
 #include "URL.h"
 #include "GnashException.h"
 #include "sprite_instance.h"
+#include "fn_call.h"
 
 #include <string>
 
Index: gnash/server/NetConnection.cpp
diff -u gnash/server/NetConnection.cpp:1.8 gnash/server/NetConnection.cpp:1.9
--- gnash/server/NetConnection.cpp:1.8  Mon Apr 24 23:05:56 2006
+++ gnash/server/NetConnection.cpp      Sat May 20 23:49:33 2006
@@ -43,6 +43,7 @@
 #include <string>
 #include "log.h"
 #include "NetConnection.h"
+#include "fn_call.h"
 
 using namespace std;
 
Index: gnash/server/NetStream.cpp
diff -u gnash/server/NetStream.cpp:1.4 gnash/server/NetStream.cpp:1.5
--- gnash/server/NetStream.cpp:1.4      Mon Apr 24 23:05:56 2006
+++ gnash/server/NetStream.cpp  Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "NetStream.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/Selection.cpp
diff -u gnash/server/Selection.cpp:1.4 gnash/server/Selection.cpp:1.5
--- gnash/server/Selection.cpp:1.4      Mon Apr 24 23:05:56 2006
+++ gnash/server/Selection.cpp  Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "Selection.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/SharedObject.cpp
diff -u gnash/server/SharedObject.cpp:1.4 gnash/server/SharedObject.cpp:1.5
--- gnash/server/SharedObject.cpp:1.4   Mon Apr 24 23:05:56 2006
+++ gnash/server/SharedObject.cpp       Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "SharedObject.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/Stage.cpp
diff -u gnash/server/Stage.cpp:1.4 gnash/server/Stage.cpp:1.5
--- gnash/server/Stage.cpp:1.4  Mon Apr 24 23:05:56 2006
+++ gnash/server/Stage.cpp      Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "Stage.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/System.cpp
diff -u gnash/server/System.cpp:1.7 gnash/server/System.cpp:1.8
--- gnash/server/System.cpp:1.7 Sat May 20 19:49:41 2006
+++ gnash/server/System.cpp     Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "System.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/TextSnapshot.cpp
diff -u gnash/server/TextSnapshot.cpp:1.4 gnash/server/TextSnapshot.cpp:1.5
--- gnash/server/TextSnapshot.cpp:1.4   Mon Apr 24 23:05:56 2006
+++ gnash/server/TextSnapshot.cpp       Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "TextSnapshot.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/Video.cpp
diff -u gnash/server/Video.cpp:1.4 gnash/server/Video.cpp:1.5
--- gnash/server/Video.cpp:1.4  Mon Apr 24 23:05:56 2006
+++ gnash/server/Video.cpp      Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "Video.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/action.cpp
diff -u gnash/server/action.cpp:1.77 gnash/server/action.cpp:1.78
--- gnash/server/action.cpp:1.77        Fri May 19 18:09:03 2006
+++ gnash/server/action.cpp     Sat May 20 23:49:33 2006
@@ -64,8 +64,8 @@
 #include "xmlsocket.h"
 #endif
 
-#include "Boolean.h"
-#include "Camera.h"
+//#include "Boolean.h"
+//#include "Camera.h"
 //#include "Color.h"
 //#include "ContextMenu.h"
 //#include "CustomActions.h"
@@ -89,6 +89,8 @@
 #include "ASHandlers.h"
 #include "URL.h"
 #include "GnashException.h"
+#include "as_environment.h"
+#include "fn_call.h"
 
 #ifndef GUI_GTK
 int windowid = 0;
Index: gnash/server/action.h
diff -u gnash/server/action.h:1.30 gnash/server/action.h:1.31
--- gnash/server/action.h:1.30  Fri May 19 18:09:03 2006
+++ gnash/server/action.h       Sat May 20 23:49:33 2006
@@ -56,11 +56,11 @@
 #include "smart_ptr.h"
 //#include "Function.h"
 #include "log.h"
-#include "as_environment.h" // for fn_call inlines
+//#include "as_environment.h" // for fn_call inlines
 
 namespace gnash {
        struct movie;
-       //struct as_environment;
+       struct as_environment;
        class as_object;
        struct as_value;
        struct function_as_object;
@@ -259,10 +259,6 @@
        };
 
 
-       struct fn_call;
-       typedef void (*as_c_function_ptr)(const fn_call& fn);
-
-
        struct as_property_interface
        {
                virtual ~as_property_interface() {}
@@ -300,37 +296,6 @@
 #endif // 0
 
 
-       /// Parameters/environment for C functions callable from ActionScript.
-       struct fn_call
-       {
-               as_value* result;
-               as_object* this_ptr;
-               as_environment* env;
-               int nargs;
-               int first_arg_bottom_index;
-
-               fn_call(as_value* res_in, as_object* this_in,
-                               as_environment* env_in,
-                               int nargs_in, int first_in)
-                       :
-                       result(res_in),
-                       this_ptr(this_in),
-                       env(env_in),
-                       nargs(nargs_in),
-                       first_arg_bottom_index(first_in)
-               {
-               }
-
-               /// Access a particular argument.
-               as_value& arg(int n) const
-               {
-                       assert(n < nargs);
-                       return env->bottom(first_arg_bottom_index - n);
-               }
-
-       };
-
-
        //
        // Some handy helpers
        //
Index: gnash/server/array.cpp
diff -u gnash/server/array.cpp:1.24 gnash/server/array.cpp:1.25
--- gnash/server/array.cpp:1.24 Tue May 16 11:53:06 2006
+++ gnash/server/array.cpp      Sat May 20 23:49:33 2006
@@ -52,9 +52,10 @@
 #include <memory> // for auto_ptr
 
 #include "array.h"
-#include "action.h"
+//#include "action.h"
 #include "log.h"
 #include "Function.h" // for Array class
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/gen-files.sh
diff -u gnash/server/gen-files.sh:1.3 gnash/server/gen-files.sh:1.4
--- gnash/server/gen-files.sh:1.3       Wed Apr 26 21:07:30 2006
+++ gnash/server/gen-files.sh   Sat May 20 23:49:33 2006
@@ -87,6 +87,7 @@
 
 #include "impl.h"
 #include "log.h"
+#include "as_object.h" // for inheritance
 
 namespace gnash {
   
@@ -171,6 +172,7 @@
 
 #include "log.h"
 #include "${asname}.h"
+#include "fn_call.h"
 
 namespace gnash {
 
Index: gnash/server/network.cpp
diff -u gnash/server/network.cpp:1.9 gnash/server/network.cpp:1.10
--- gnash/server/network.cpp:1.9        Mon May  8 21:12:24 2006
+++ gnash/server/network.cpp    Sat May 20 23:49:33 2006
@@ -44,6 +44,7 @@
 #include "log.h"
 #include "xml.h"
 #include "network.h"
+#include "fn_call.h"
 
 #include <sys/types.h>
 #ifdef HAVE_WINSOCK_H
Index: gnash/server/shm.cpp
diff -u gnash/server/shm.cpp:1.10 gnash/server/shm.cpp:1.11
--- gnash/server/shm.cpp:1.10   Mon Apr 24 23:05:56 2006
+++ gnash/server/shm.cpp        Sat May 20 23:49:33 2006
@@ -61,6 +61,7 @@
 
 #include "log.h"
 #include "shm.h"
+#include "fn_call.h"
 
 using namespace std;
 
Index: gnash/server/sprite_instance.cpp
diff -u gnash/server/sprite_instance.cpp:1.5 
gnash/server/sprite_instance.cpp:1.6
--- gnash/server/sprite_instance.cpp:1.5        Thu May 11 12:24:16 2006
+++ gnash/server/sprite_instance.cpp    Sat May 20 23:49:33 2006
@@ -52,7 +52,7 @@
 #include <string>
 
 #include "log.h" 
-#include "action.h" 
+//#include "action.h" 
 #include "gnash.h"
 #include "Sprite.h"
 #include "sprite_instance.h"
@@ -60,6 +60,7 @@
 #include "Function.h"
 #include "text.h"
 #include "execute_tag.h"
+#include "fn_call.h"
 
 using namespace std;
 
Index: gnash/server/sprite_instance.h
diff -u gnash/server/sprite_instance.h:1.3 gnash/server/sprite_instance.h:1.4
--- gnash/server/sprite_instance.h:1.3  Mon May  8 21:12:24 2006
+++ gnash/server/sprite_instance.h      Sat May 20 23:49:33 2006
@@ -52,6 +52,7 @@
 #include "dlist.h" // display_list 
 #include "stream.h"
 #include "log.h"
+#include "as_environment.h" // for composition
 
 namespace gnash
 {
Index: gnash/server/string.cpp
diff -u gnash/server/string.cpp:1.6 gnash/server/string.cpp:1.7
--- gnash/server/string.cpp:1.6 Mon Apr 24 23:05:56 2006
+++ gnash/server/string.cpp     Sat May 20 23:49:33 2006
@@ -42,6 +42,7 @@
 #include "gstring.h"
 #include "log.h"
 #include "smart_ptr.h"
+#include "fn_call.h"
 
 namespace gnash {
        void string_method(const fn_call& fn, const tu_stringi& method_name, 
const tu_string& this_string)
Index: gnash/server/swf/ASHandlers.cpp
diff -u gnash/server/swf/ASHandlers.cpp:1.2 gnash/server/swf/ASHandlers.cpp:1.3
--- gnash/server/swf/ASHandlers.cpp:1.2 Tue May 16 09:17:54 2006
+++ gnash/server/swf/ASHandlers.cpp     Sat May 20 23:49:33 2006
@@ -46,10 +46,11 @@
 #include "swf.h"
 #include "ASHandlers.h"
 #include "movie_definition.h"
-#include "action.h"
+//#include "action.h"
 #include "array.h"
 #include "Function.h"
 #include "tu_random.h"
+#include "fn_call.h"
 
 using namespace std;
 
Index: gnash/server/textformat.cpp
diff -u gnash/server/textformat.cpp:1.10 gnash/server/textformat.cpp:1.11
--- gnash/server/textformat.cpp:1.10    Thu May 18 08:11:59 2006
+++ gnash/server/textformat.cpp Sat May 20 23:49:33 2006
@@ -38,7 +38,8 @@
 
 #include "log.h"
 #include "textformat.h"
-#include "action.h" // for fn_call
+#include "action.h" // for struct with_stack_entry
+#include "fn_call.h"
 
 namespace gnash {  
 
Index: gnash/server/timers.cpp
diff -u gnash/server/timers.cpp:1.7 gnash/server/timers.cpp:1.8
--- gnash/server/timers.cpp:1.7 Mon Apr 24 23:05:56 2006
+++ gnash/server/timers.cpp     Sat May 20 23:49:33 2006
@@ -37,12 +37,14 @@
 //
 
 #include "log.h"
-#include "action.h"
-#include "Function.h"
-#include "impl.h"
+//#include "action.h"
+#include "Function.h" // for class function_as_object
+//#include "impl.h"
 #include "log.h"
 #include "smart_ptr.h"
 
+#include "fn_call.h"
+
 #include "timers.h"
 #include "xml.h"
 
Index: gnash/server/xml.cpp
diff -u gnash/server/xml.cpp:1.19 gnash/server/xml.cpp:1.20
--- gnash/server/xml.cpp:1.19   Wed May 17 08:13:05 2006
+++ gnash/server/xml.cpp        Sat May 20 23:49:33 2006
@@ -46,11 +46,12 @@
 #include <vector>
 
 #include "log.h"
-#include "action.h"
-#include "impl.h"
+//#include "action.h"
+//#include "impl.h"
 #include "smart_ptr.h"
 #include "tu_config.h"
-#include "Function.h"
+#include "Function.h" // for function_as_object
+#include "fn_call.h"
 
 #ifdef HAVE_LIBXML
 
Index: gnash/server/xmlnode.cpp
diff -u gnash/server/xmlnode.cpp:1.10 gnash/server/xmlnode.cpp:1.11
--- gnash/server/xmlnode.cpp:1.10       Mon Apr 24 23:05:56 2006
+++ gnash/server/xmlnode.cpp    Sat May 20 23:49:33 2006
@@ -45,11 +45,13 @@
 #include <vector>
 
 #include "log.h"
-#include "action.h"
-#include "impl.h"
+//#include "action.h"
+//#include "impl.h"
 #include "smart_ptr.h"
 #include "tu_config.h"
-#include "Function.h"
+//#include "Function.h"
+
+#include "fn_call.h"
 
 #ifdef HAVE_LIBXML
 
Index: gnash/server/xmlsocket.cpp
diff -u gnash/server/xmlsocket.cpp:1.14 gnash/server/xmlsocket.cpp:1.15
--- gnash/server/xmlsocket.cpp:1.14     Mon May  8 21:12:24 2006
+++ gnash/server/xmlsocket.cpp  Sat May 20 23:49:33 2006
@@ -46,6 +46,7 @@
 #include "xmlsocket.h"
 #include "timers.h"
 #include "Function.h"
+#include "fn_call.h"
 
 #ifdef HAVE_LIBXML
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]