[Gnash-commit] /srv/bzr/gnash/trunk r9686: Allow the Ming tests to run on OpenBSD by added some includes and forcing

[Bastiaan Jacques]

------------------------------------------------------------
revno: 9686
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Sat 2008-09-06 09:35:31 +0200
message:
  Allow the Ming tests to run on OpenBSD by added some includes and forcing
  the argument to sqrt to floating point to resolve ambiguity.
modified:
  testsuite/libcore.all/EdgeTest.cpp
  testsuite/libcore.all/StreamTest.cpp
  testsuite/misc-ming.all/DragDropTestRunner.cpp
    ------------------------------------------------------------
    revno: 9683.1.1
    committer: Bastiaan Jacques <address@hidden>
    branch nick: deleter
    timestamp: Sat 2008-09-06 07:38:21 +0200
    message:
      Add portability headers. sqrt takes floating numbers, not int64.
    modified:
      testsuite/libcore.all/EdgeTest.cpp
      testsuite/libcore.all/StreamTest.cpp
      testsuite/misc-ming.all/DragDropTestRunner.cpp
    ------------------------------------------------------------
    revno: 9683.1.2
    committer: Bastiaan Jacques <address@hidden>
    branch nick: deleter
    timestamp: Sat 2008-09-06 07:39:19 +0200
    message:
      Add ContainerUtils.h, a utility file to use for all kinds of containers.
    added:
      libcore/ContainerUtils.h
    ------------------------------------------------------------
    revno: 9683.1.3
    committer: Bastiaan Jacques <address@hidden>
    branch nick: deleter
    timestamp: Sat 2008-09-06 07:39:49 +0200
    message:
      Add ContainerUtils.h to the noinst-headers.
    modified:
      libcore/Makefile.am
    ------------------------------------------------------------
    revno: 9683.1.4
    committer: Bastiaan Jacques <address@hidden>
    branch nick: deleter
    timestamp: Sat 2008-09-06 07:40:14 +0200
    message:
      Add portability includes.
    modified:
      libnet/network.cpp
      libnet/rtmp_client.cpp
    ------------------------------------------------------------
    revno: 9683.1.5
    committer: Bastiaan Jacques <address@hidden>
    branch nick: deleter
    timestamp: Sat 2008-09-06 07:40:40 +0200
    message:
      Use the new delete_ptr_container utility.
    modified:
      libcore/parser/video_stream_def.cpp

=== modified file 'testsuite/libcore.all/EdgeTest.cpp'
--- a/testsuite/libcore.all/EdgeTest.cpp        2008-01-21 23:26:48 +0000
+++ b/testsuite/libcore.all/EdgeTest.cpp        2008-09-06 05:38:21 +0000
@@ -87,8 +87,8 @@
        check_equals(edge::pointOnCurve(A, C, B, 0), A);
        check_equals(edge::pointOnCurve(A, C, B, 1), B);
        check_equals(edge::pointOnCurve(A, C, B, 0.5), point(17.5, 12.5));
-       check_equals(sqrt(edge::squareDistancePtCurve(A, C, B, B, 1)), 0);
-       check_equals(sqrt(edge::squareDistancePtCurve(A, C, B, A, 0)), 0);
+       check_equals(sqrt((float)edge::squareDistancePtCurve(A, C, B, B, 1)), 
0);
+       check_equals(sqrt((float)edge::squareDistancePtCurve(A, C, B, A, 0)), 
0);
 
        //
        // A----B---C
@@ -99,7 +99,7 @@
        check_equals(edge::pointOnCurve(A, C, B, 0), A);
        check_equals(edge::pointOnCurve(A, C, B, 1), B);
        check_equals(edge::pointOnCurve(A, C, B, 0.5), point(27.5, 10));
-       check_equals(sqrt(edge::squareDistancePtCurve(A, C, B, B, 1)), 0);
-       check_equals(sqrt(edge::squareDistancePtCurve(A, C, B, A, 0)), 0);
+       check_equals(sqrt((float)edge::squareDistancePtCurve(A, C, B, B, 1)), 
0);
+       check_equals(sqrt((float)edge::squareDistancePtCurve(A, C, B, A, 0)), 
0);
 }
 

=== modified file 'testsuite/libcore.all/StreamTest.cpp'
--- a/testsuite/libcore.all/StreamTest.cpp      2008-08-22 15:11:39 +0000
+++ b/testsuite/libcore.all/StreamTest.cpp      2008-09-06 05:38:21 +0000
@@ -27,6 +27,8 @@
 #include "check.h"
 #endif
 
+#include <boost/thread/mutex.hpp>
+
 #include "tu_file.h"
 #include "SWFStream.h"
 #include "log.h"
@@ -42,6 +44,7 @@
 #include <string.h>
 #include <sstream>
 
+
 using namespace std;
 using namespace gnash;
 

=== modified file 'testsuite/misc-ming.all/DragDropTestRunner.cpp'
--- a/testsuite/misc-ming.all/DragDropTestRunner.cpp    2008-07-08 09:36:41 
+0000
+++ b/testsuite/misc-ming.all/DragDropTestRunner.cpp    2008-09-06 05:38:21 
+0000
@@ -33,6 +33,8 @@
 #include <string>
 #include <cassert>
 #include <sstream>
+#include <unistd.h>
+
 
 using namespace gnash;
 using namespace gnash::geometry;