[Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/ming_ut...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/02 10:38:34

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: ming_utils.c ming_utils.h 

Log message:
        * testsuite/misc-ming.all/ming_utils.{c,h}: fix compiler warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2746&r2=1.2747
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.c?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.h?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2746
retrieving revision 1.2747
diff -u -b -r1.2746 -r1.2747
--- ChangeLog   2 Apr 2007 09:50:43 -0000       1.2746
+++ ChangeLog   2 Apr 2007 10:38:34 -0000       1.2747
@@ -1,5 +1,6 @@
 2007-04-02 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/ming_utils.{c,h}: fix compiler warnings.
        * testsuite/samples/: gotoFrameOnKeyEvent.swf, README:
          Add new tests used to debug keypress listeners and
          goto_frame. Provided by Dongdong <address@hidden>

Index: testsuite/misc-ming.all/ming_utils.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- testsuite/misc-ming.all/ming_utils.c        29 Mar 2007 06:54:09 -0000      
1.23
+++ testsuite/misc-ming.all/ming_utils.c        2 Apr 2007 10:38:34 -0000       
1.24
@@ -25,6 +25,7 @@
 #include <stdarg.h>
 
 void add_xtrace_function_clip(SWFMovieClip mo, SWFBlock font, int depth, int 
x, int y, int width, int height);
+static SWFAction get_dejagnu_actions(void);
 
 void
 add_xtrace_function_clip(SWFMovieClip mc, SWFBlock font, int depth, int x, int 
y, int width, int height)
@@ -157,11 +158,9 @@
        return sh;
 }
 
-SWFAction
+static SWFAction
 get_dejagnu_actions()
 {
-       SWFAction ac;
-
        static const size_t BUFLEN = 4096;
 
        char buf[BUFLEN];
@@ -295,7 +294,7 @@
 {
        SWFAction ac;
        ac = compileSWFActionCode(code);
-       SWFMovieClip_addInitAction(mo, (SWFBlock)ac);
+       SWFMovieClip_addInitAction(mo, ac);
 }
 #endif // MING_SUPPORTS_INIT_ACTIONS
 

Index: testsuite/misc-ming.all/ming_utils.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- testsuite/misc-ming.all/ming_utils.h        29 Mar 2007 06:54:09 -0000      
1.16
+++ testsuite/misc-ming.all/ming_utils.h        2 Apr 2007 10:38:34 -0000       
1.17
@@ -26,6 +26,19 @@
 # define MING_SUPPORTS_INIT_ACTIONS
 #endif
 
+/*
+ * This is to avoid the annoying warnings
+ * coming from Ming when using the deprecated
+ * compileSWFActionCode interface.
+ * A cleaner approach is likely switch to
+ * using newSWFAction always and change the
+ * macro to make it output compileSWFActionCode
+ * when MING_VERSION_CODE < 000040004
+ */
+#if MING_VERSION_CODE >= 00040004
+# define compileSWFActionCode newSWFAction
+#endif
+
 /* Missing define to allow using older Ming releases */
 
 #ifndef SWFACTION_INIT