[Gnash-commit] /srv/bzr/gnash/trunk r10317: Patch adding boost namespace to stdint types and dropping unnecessary

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10317
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Fri 2008-11-21 14:06:23 +0100
message:
  Patch adding boost namespace to stdint types and dropping unnecessary
  includes. Thanks to Tonko Juricic.
modified:
  libamf/amf.cpp
  libamf/lcshm.cpp
  libamf/lcshm.h
  libamf/sol.cpp
    ------------------------------------------------------------
    revno: 10315.1.7
    committer: Benjamin Wolsey <address@hidden>
    branch nick: test
    timestamp: Fri 2008-11-21 14:05:13 +0100
    message:
      Apply patch from Tonko Juricic to enable libamf to build on msvc++.
    modified:
      libamf/amf.cpp
      libamf/lcshm.cpp
      libamf/lcshm.h
      libamf/sol.cpp

=== modified file 'libamf/amf.cpp'
--- a/libamf/amf.cpp    2008-10-26 23:35:38 +0000
+++ b/libamf/amf.cpp    2008-11-21 13:05:13 +0000
@@ -25,12 +25,6 @@
 #include <string>
 #include <vector>
 
-#if defined(_WIN32) || defined(WIN32)
-# include <winsock2.h>
-#else
-# include <netinet/in.h>
-#endif
-
 #include "log.h"
 #include "GnashException.h"
 #include "buffer.h"

=== modified file 'libamf/lcshm.cpp'
--- a/libamf/lcshm.cpp  2008-10-26 23:35:38 +0000
+++ b/libamf/lcshm.cpp  2008-11-21 13:05:13 +0000
@@ -20,7 +20,6 @@
 #include "gnashconfig.h"
 #endif
 
-#include <unistd.h>
 #include <cerrno>
 #include <vector>
 #include <string>
@@ -455,8 +454,8 @@
         return false; 
     }
     
-    uint8_t* baseAddress = reinterpret_cast<uint8_t *>(Shm::getAddr());
-    uint8_t* tooFar = baseAddress+Shm::getSize();
+       boost::uint8_t* baseAddress = reinterpret_cast<boost::uint8_t 
*>(Shm::getAddr());
+       boost::uint8_t* tooFar = baseAddress+Shm::getSize();
     Listener::setBaseAddress(baseAddress);
     _baseaddr = baseAddress;
     parseHeader(baseAddress, tooFar);
@@ -489,8 +488,8 @@
         return false; 
     }
     
-    uint8_t* baseAddress = reinterpret_cast<uint8_t *>(Shm::getAddr());
-    uint8_t* tooFar = baseAddress+Shm::getSize();
+       boost::uint8_t* baseAddress = reinterpret_cast<boost::uint8_t 
*>(Shm::getAddr());
+       boost::uint8_t* tooFar = baseAddress+Shm::getSize();
     Listener::setBaseAddress(baseAddress);
     _baseaddr = baseAddress;
     parseHeader(baseAddress, tooFar);

=== modified file 'libamf/lcshm.h'
--- a/libamf/lcshm.h    2008-10-26 23:35:38 +0000
+++ b/libamf/lcshm.h    2008-11-21 13:05:13 +0000
@@ -119,11 +119,11 @@
     /// \struct LcShm::lc_header_t
     ///                Hold the data in the memory segment's header.
     typedef struct {
-        uint32_t unknown1;
-        uint32_t unknown2;
-        uint32_t timestamp;    // number of milliseconds that have
+               boost::uint32_t unknown1;
+               boost::uint32_t unknown2;
+               boost::uint32_t timestamp;      // number of milliseconds that 
have
                                // elapsed since the system was started
-        uint32_t length;
+               boost::uint32_t length;
     } lc_header_t;
     /// \struct LcShm::lc_message_t
     ///                Hold the data for a single message in the memory 
segment.

=== modified file 'libamf/sol.cpp'
--- a/libamf/sol.cpp    2008-10-26 23:35:38 +0000
+++ b/libamf/sol.cpp    2008-11-21 13:05:13 +0000
@@ -200,7 +200,7 @@
     // we just built it the same way it always is.
     // first is the TCSO, we have no idea what this stands for.
 //    ptr = reinterpret_cast<uint8_t *>(const_cast<uint8_t *>("TCSO");
-    ptr = (uint8_t *)"TCSO";
+       ptr = (boost::uint8_t *)"TCSO";
     for (i=0; i<sizeof(boost::uint32_t); i++) {
         _header.push_back(ptr[i]);
     }
@@ -337,7 +337,7 @@
     }
     
     _filesize = ptr - body.get();
-    int len = name.size() + sizeof(uint16_t) + 16;
+       int len = name.size() + sizeof(boost::uint16_t) + 16;
     boost::scoped_array<char> head ( new char[len + 4] );
     memset(head.get(), 0, len);
     ptr = head.get();