[Gnash-commit] /srv/bzr/gnash/trunk r11424: Small changes to TextField class to avoid errors with INLINE definition.

[Andrea Palmatè]

------------------------------------------------------------
revno: 11424
committer: Andrea Palmatè <address@hidden>
branch nick: gnash
timestamp: Fri 2009-08-14 15:01:46 +0200
message:
  Small changes to TextField class to avoid errors with INLINE definition.
modified:
  libcore/TextField.cpp
  libcore/TextField.h
  libcore/asobj/Globals.cpp
  libcore/asobj/TextFormat_as.cpp
  libnet/rtmp.h

=== modified file 'libcore/TextField.cpp'
--- a/libcore/TextField.cpp     2009-08-13 21:49:55 +0000
+++ b/libcore/TextField.cpp     2009-08-14 13:01:46 +0000
@@ -1951,7 +1951,7 @@
                             setTabStops(originaltabstops);
                         } else if (s == "P") {
                             //paragraph
-                            if (_display == BLOCK)
+                            if (_display == TEXTFORMAT_BLOCK)
                             {
                                 handleChar(it, e, x, y, newrec, last_code,
                                         last_space_glyph,

=== modified file 'libcore/TextField.h'
--- a/libcore/TextField.h       2009-08-12 17:03:54 +0000
+++ b/libcore/TextField.h       2009-08-14 13:01:46 +0000
@@ -57,8 +57,8 @@
        /// Text format display values
        enum TextFormatDisplay
        {
-               BLOCK = 0,
-               INLINE = 1
+               TEXTFORMAT_BLOCK = 0,
+               TEXTFORMAT_INLINE = 1
        };
        
        /// Possible autoSize values

=== modified file 'libcore/asobj/Globals.cpp'
--- a/libcore/asobj/Globals.cpp 2009-08-13 08:52:05 +0000
+++ b/libcore/asobj/Globals.cpp 2009-08-14 13:01:46 +0000
@@ -979,7 +979,7 @@
     if (major < 0) return as_value();
 
     const std::string& props = fn.arg(2).to_string();
-    const int minor = fn.nargs > 3 ? std::max(fn.arg(3).to_int(), 0) : 0;
+    const int minor = fn.nargs > 3 ? std::max(fn.arg(3).to_int(), 
(boost::int32_t)0) : 0;
 
     std::string::const_iterator pos = props.begin();
 

=== modified file 'libcore/asobj/TextFormat_as.cpp'
--- a/libcore/asobj/TextFormat_as.cpp   2009-08-13 07:22:56 +0000
+++ b/libcore/asobj/TextFormat_as.cpp   2009-08-14 13:01:46 +0000
@@ -660,12 +660,12 @@
 parseDisplayString(const std::string& display)
 {
        StringNoCaseEqual cmp;
-       if (cmp(display, "inline")) return TextField::INLINE;
-       if (cmp(display, "block")) return TextField::BLOCK;
+       if (cmp(display, "inline")) return TextField::TEXTFORMAT_INLINE;
+       if (cmp(display, "block")) return TextField::TEXTFORMAT_BLOCK;
        
     // Is this correct? We have to return something here...
        log_debug("Invalid display string %s ", display);
-    return TextField::BLOCK;
+    return TextField::TEXTFORMAT_BLOCK;
 }
 
 const char* 
@@ -692,9 +692,9 @@
 {
        switch (a)
        {
-               case TextField::INLINE:
+               case TextField::TEXTFORMAT_INLINE:
                        return "inline";
-               case TextField::BLOCK:
+               case TextField::TEXTFORMAT_BLOCK:
                        return "block";
                default:
                        log_error("Unknown display value: %d ", a);

=== modified file 'libnet/rtmp.h'
--- a/libnet/rtmp.h     2009-08-08 02:47:08 +0000
+++ b/libnet/rtmp.h     2009-08-14 13:01:46 +0000
@@ -32,6 +32,7 @@
 #include "rtmp_msg.h"
 #include "cque.h"
 #include "dsodefs.h"
+#include "utility.h"
 
 namespace gnash
 {