[Gnash-commit] gnash ChangeLog libnet/cque.h libnet/handler.cp...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  08/06/14 17:49:20

Modified files:
        .              : ChangeLog 
        libnet         : cque.h handler.cpp handler.h network.h 

Log message:
        Added DSOEXPORT.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6930&r2=1.6931
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/cque.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/handler.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/handler.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/network.h?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6930
retrieving revision 1.6931
diff -u -b -r1.6930 -r1.6931
--- ChangeLog   14 Jun 2008 17:18:28 -0000      1.6930
+++ ChangeLog   14 Jun 2008 17:49:19 -0000      1.6931
@@ -1,15 +1,16 @@
 2008-03-14 Markus Gothe <address@hidden>
 
-       * libnet/handler.h: Added DSOEXPORT.
-       * libnet/{handler, rtmp}.cpp: Fixed uninitilzied vars.
+       * libnet/{handler, network, cque}.h: Added DSOEXPORT.
+       * libnet/{handler, rtmp}.cpp: Added DSOEXPORT and Fixed uninitilzied
+         vars.
 
 2008-03-13 Markus Gothe <address@hidden>
 
        * libmedia/ffmpeg/AudioDecoderFfmpeg.cpp: Fixed typecasting for 
          std::max().
        * macros/opengl.m4: Fix for Leopard and OGL, see:
-         http://wiki.finkproject.org/index.php/Fink:
-         Packaging:Preparing_for_10.5#OpenGL_Bug
+         "http://wiki.finkproject.org/index.php/Fink:
+         Packaging:Preparing_for_10.5#OpenGL_Bug"
        * backend/render_handler_ogl.h: Should fix bug #23352.
        * testsuite/samples/Makefile.am, testsuite/movies.all/Makefile.am:
          Let testcases run on OS X.

Index: libnet/cque.h
===================================================================
RCS file: /sources/gnash/gnash/libnet/cque.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libnet/cque.h       6 Apr 2008 18:11:34 -0000       1.7
+++ libnet/cque.h       14 Jun 2008 17:49:20 -0000      1.8
@@ -27,6 +27,7 @@
 #include "getclocktime.hpp"
 #include "buffer.h"
 #include "network.h"
+#include "dsodefs.h" //For DSOEXPORT.
 
 // _definst_ is the default instance name
 namespace gnash
@@ -53,7 +54,7 @@
     // Peek at the first date element witjhout removing it from the que
     amf::Buffer *peek();
     // Get the number of elements in the que
-    size_t size();
+    size_t DSOEXPORT size();
     // Wait for a condition variable to trigger
     void wait();
     // Notify a condition variable to trigger

Index: libnet/handler.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/handler.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libnet/handler.cpp  14 Jun 2008 17:18:30 -0000      1.8
+++ libnet/handler.cpp  14 Jun 2008 17:49:20 -0000      1.9
@@ -33,6 +33,7 @@
 #include "network.h"
 #include "buffer.h"
 #include "utility.h"
+#include "dsodefs.h" //For DSOEXPORT.
 
 #include "rtmp.h"
 #include "rtmp_server.h"
@@ -45,7 +46,7 @@
 namespace gnash
 {
 
-map<int, Handler *> handlers;
+map<int, Handler *> DSOEXPORT handlers;
 
 Handler::Handler()
     : _die(false), _netfd(0)

Index: libnet/handler.h
===================================================================
RCS file: /sources/gnash/gnash/libnet/handler.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libnet/handler.h    14 Jun 2008 17:18:30 -0000      1.5
+++ libnet/handler.h    14 Jun 2008 17:49:20 -0000      1.6
@@ -29,7 +29,7 @@
 #include "buffer.h"
 #include "cque.h"
 #include "network.h"
-#include "dsodefs.h"
+#include "dsodefs.h" //For DSOEXPORT.
 
 // _definst_ is the default instance name
 namespace gnash
@@ -129,10 +129,10 @@
     bool DSOEXPORT start(thread_params_t *args);
 
     // Take a buffer and write it to the network
-    int writeNet(int fd, amf::Buffer *buf)
+    int  DSOEXPORT writeNet(int fd, amf::Buffer *buf)
        { return Network::writeNet(fd, buf->reference(), buf->size()); };
     
-    int writeNet(amf::Buffer *buf)
+    int  DSOEXPORT writeNet(amf::Buffer *buf)
        { return Network::writeNet(buf->reference(), buf->size()); };
     
     // Dump internal data.

Index: libnet/network.h
===================================================================
RCS file: /sources/gnash/gnash/libnet/network.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libnet/network.h    21 May 2008 08:31:01 -0000      1.4
+++ libnet/network.h    14 Jun 2008 17:49:20 -0000      1.5
@@ -63,23 +63,23 @@
 // Adjust for the constant size
 const size_t NETBUFSIZE = 1357*2;      // 1500 appears to be the default size 
as used by FMS
 
-class Network {
+class DSOEXPORT Network {
 public:
     typedef boost::uint8_t byte_t;
 
-    DSOEXPORT Network();
-    DSOEXPORT ~Network();
+    Network();
+    ~Network();
     
     // Create a new server. After creating it, then you have to wait
     // for an incoming connection.
     int createServer(void);
-    DSOEXPORT int createServer(short port);
+    int createServer(short port);
     
     // Accept a client connection for the current server.
     int newConnection(void);
     int newConnection(int fd);
     int newConnection(bool block, int fd);
-    DSOEXPORT int newConnection(bool block);
+    int newConnection(bool block);
 
     // Connect to a named pipe
     bool connectSocket(const std::string &sock);
@@ -88,27 +88,27 @@
     bool createClient(void);
     bool createClient(short port);
     bool createClient(const std::string &hostname);
-    DSOEXPORT bool createClient(const std::string &hostname, short port);
+    bool createClient(const std::string &hostname, short port);
 
     // Read from the connection
 //    int readNet(Buffer &buffer);
     int readNet(byte_t *buffer, int nbytes);
-    DSOEXPORT int readNet(byte_t *buffer, int nbytes, int timeout);
+    int readNet(byte_t *buffer, int nbytes, int timeout);
     int readNet(int fd, byte_t *buffer, int nbytes);
     int readNet(int fd, byte_t *buffer, int nbytes, int timeout);
     
     // Write to the connection
 //    int writeNet(gnash::Buffer &buffer);
     int writeNet(const std::string &buffer);
-    DSOEXPORT int writeNet(const byte_t *buffer, int nbytes);
+    int writeNet(const byte_t *buffer, int nbytes);
 //    int writeNet(int fd, const byte_t *buffer);
     int writeNet(int fd, const byte_t *buffer, int nbytes);
     int writeNet(int fd, const byte_t *buffer, int nbytes, int timeout);
     
     // Close the connection
-    DSOEXPORT bool closeNet();
+    bool closeNet();
     bool closeNet(int fd);
-    DSOEXPORT bool closeConnection();
+    bool closeConnection();
     bool closeConnection(int fd);
 
     // Change the debug flag