[Gnash-commit] gnash libnet/rtmp_server.cpp ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/05/24 10:52:09

Modified files:
        libnet         : rtmp_server.cpp 
        .              : ChangeLog 

Log message:
                * libnet/rtmp_server.cpp: Use swapBytes() instead of ntohl(), so
                mingw32 is happy.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/rtmp_server.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6697&r2=1.6698

Patches:
Index: libnet/rtmp_server.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/rtmp_server.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libnet/rtmp_server.cpp      16 May 2008 03:46:32 -0000      1.6
+++ libnet/rtmp_server.cpp      24 May 2008 10:52:07 -0000      1.7
@@ -626,7 +626,7 @@
     boost::uint16_t typefield = *reinterpret_cast<boost::uint16_t *>(&type);
     ptr += sizeof(boost::uint16_t); // go past the first short
 
-//    boost::uint32_t swapped = 0;
+    boost::uint32_t swapped = 0;
     swapBytes(&typefield, sizeof(boost::uint16_t));
     buf->copy(typefield);
     switch (type) {
@@ -638,8 +638,9 @@
       case PING_TIME:
       {
          ptr += sizeof(boost::uint16_t); // go past the second short
-//       swapped = htonl(milliseconds);
-         buf->append(htonl(milliseconds));
+         swapped = milliseconds;
+         swapBytes(&swapped, sizeof(boost::uint32_t));
+         buf->append(swapped);
          break;
       }
       // reset doesn't have any parameters
@@ -650,7 +651,9 @@
       case PONG_CLIENT:
       {
 //       swapped = htonl(milliseconds);
-         buf->append(htonl(milliseconds));
+         swapped = milliseconds;
+         swapBytes(&swapped, sizeof(boost::uint32_t));
+         buf->append(swapped);
          break;
       }
       default:

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6697
retrieving revision 1.6698
diff -u -b -r1.6697 -r1.6698
--- ChangeLog   24 May 2008 10:38:03 -0000      1.6697
+++ ChangeLog   24 May 2008 10:52:08 -0000      1.6698
@@ -1,3 +1,8 @@
+2008-05-24  Rob Savoye  <address@hidden>
+
+       * libnet/rtmp_server.cpp: Use swapBytes() instead of ntohl(), so
+       mingw32 is happy.
+
 2008-05-24 Sandro Santilli <address@hidden>
 
        * server/VirtualClock.h: add interruptable wrapper for VirtualClocks.