[Gnash-commit] /srv/bzr/gnash/trunk r10633: Changes to allow compilation with OpenSolaris: include correct header

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10633
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2009-02-26 19:48:57 +0100
message:
  Changes to allow compilation with OpenSolaris: include correct header
  for finite(); Use 'struct utsname' instead of 'utsname'; be consistent
  with fixed-size int type usage.
modified:
  libbase/utility.h
  libcore/TextField.cpp
  libcore/TextField.h
  libcore/character.cpp
  libcore/movie_root.cpp
  libcore/movie_root.h
  libcore/vm/VM.cpp

=== modified file 'libbase/utility.h'
--- a/libbase/utility.h 2009-02-25 22:33:03 +0000
+++ b/libbase/utility.h 2009-02-26 18:48:57 +0000
@@ -24,6 +24,10 @@
 #include "gnashconfig.h"
 #endif
 
+#ifdef SOLARIS
+# include <ieeefp.h> // for finite()
+#endif
+
 #include <cassert>
 #include <string>
 #include <typeinfo>

=== modified file 'libcore/TextField.cpp'
--- a/libcore/TextField.cpp     2009-02-25 07:30:10 +0000
+++ b/libcore/TextField.cpp     2009-02-26 18:48:57 +0000
@@ -880,7 +880,7 @@
 
 
 void
-TextField::insertTab(SWF::TextRecord& rec, int& x, float scale)
+TextField::insertTab(SWF::TextRecord& rec, boost::int32_t& x, float scale)
 {
     // tab (ASCII HT)
     const int space = 32;

=== modified file 'libcore/TextField.h'
--- a/libcore/TextField.h       2009-01-22 20:10:39 +0000
+++ b/libcore/TextField.h       2009-02-26 18:48:57 +0000
@@ -477,7 +477,7 @@
     /// updated.
        void updateText(const std::wstring& s);
 
-    void insertTab(SWF::TextRecord& rec, int& x, float scale);
+    void insertTab(SWF::TextRecord& rec, boost::int32_t& x, float scale);
 
        /// What happens when setFocus() is called on this TextField.
     //

=== modified file 'libcore/character.cpp'
--- a/libcore/character.cpp     2009-01-22 20:10:39 +0000
+++ b/libcore/character.cpp     2009-02-26 18:48:57 +0000
@@ -554,7 +554,7 @@
        boost::intrusive_ptr<character> ptr = 
ensureType<character>(fn.this_ptr);
 
        // Local coord of mouse IN PIXELS.
-       int x, y, buttons;
+       boost::int32_t x, y, buttons;
        ptr->getVM().getRoot().get_mouse_state(x, y, buttons);
 
        SWFMatrix m = ptr->getWorldMatrix();
@@ -570,7 +570,7 @@
        boost::intrusive_ptr<character> ptr = 
ensureType<character>(fn.this_ptr);
 
        // Local coord of mouse IN PIXELS.
-       int x, y, buttons;
+       boost::int32_t x, y, buttons;
        ptr->getVM().getRoot().get_mouse_state(x, y, buttons);
 
        SWFMatrix m = ptr->getWorldMatrix();

=== modified file 'libcore/movie_root.cpp'
--- a/libcore/movie_root.cpp    2009-02-09 12:30:31 +0000
+++ b/libcore/movie_root.cpp    2009-02-26 18:48:57 +0000
@@ -900,7 +900,8 @@
 }
 
 void
-movie_root::get_mouse_state(int& x, int& y, int& buttons)
+movie_root::get_mouse_state(boost::int32_t& x, boost::int32_t& y,
+        boost::int32_t& buttons)
 {
 //         GNASH_REPORT_FUNCTION;
 
@@ -965,7 +966,7 @@
                return; 
        }
 
-       int     x, y, buttons;
+       boost::int32_t x, y, buttons;
        get_mouse_state(x, y, buttons);
 
        point world_mouse(PIXELS_TO_TWIPS(x), PIXELS_TO_TWIPS(y));

=== modified file 'libcore/movie_root.h'
--- a/libcore/movie_root.h      2009-02-23 15:17:47 +0000
+++ b/libcore/movie_root.h      2009-02-26 18:48:57 +0000
@@ -286,7 +286,8 @@
     //
     /// Coordinates are in PIXELS, NOT TWIPS.
     ///
-    void get_mouse_state(int& x, int& y, int& buttons);
+    void get_mouse_state(boost::int32_t& x, boost::int32_t& y,
+            boost::int32_t& buttons);
 
     void get_drag_state(drag_state& st);
 

=== modified file 'libcore/vm/VM.cpp'
--- a/libcore/vm/VM.cpp 2009-02-10 16:01:43 +0000
+++ b/libcore/vm/VM.cpp 2009-02-26 18:48:57 +0000
@@ -148,7 +148,7 @@
 #ifdef HAVE_SYS_UTSNAME_H
 // For Linux- or UNIX-based systems (POSIX 4.4 conformant)
 
-               utsname osname;
+               struct utsname osname;
                std::string tmp;
                
                uname (&osname);