[Gnash-commit] [SCM] Gnash branch, master, updated. 2ff13ecbbd156ff60d3212df57d6b51f65ac5368

[Markus Gothe]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  2ff13ecbbd156ff60d3212df57d6b51f65ac5368 (commit)
       via  99e6c5f5f7a91164f3499b1b0e9691b81619470b (commit)
      from  3ceb1fae7e19733470a15fe065c916c017760818 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=2ff13ecbbd156ff60d3212df57d6b51f65ac5368


commit 2ff13ecbbd156ff60d3212df57d6b51f65ac5368
Merge: 99e6c5f 3ceb1fa
Author: Markus Gothe <address@hidden>
Date:   Sat Dec 4 18:40:35 2010 +0100

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=99e6c5f5f7a91164f3499b1b0e9691b81619470b


commit 99e6c5f5f7a91164f3499b1b0e9691b81619470b
Author: Markus Gothe <address@hidden>
Date:   Sat Dec 4 18:39:27 2010 +0100

    Fix compilation

diff --git a/cygnal/cygnal.h b/cygnal/cygnal.h
index 32cbe1a..c5249cc 100644
--- a/cygnal/cygnal.h
+++ b/cygnal/cygnal.h
@@ -21,11 +21,12 @@
 
 #include <boost/cstdint.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
+#include <boost/thread.hpp>
 #include <vector>
 #include <string>
 #include <map>
 
+#include "dsodefs.h"
 #include "extension.h"
 #include "handler.h"
 
diff --git a/cygnal/libnet/sslclient.cpp b/cygnal/libnet/sslclient.cpp
index 4ca3ae0..fa5c36f 100644
--- a/cygnal/libnet/sslclient.cpp
+++ b/cygnal/libnet/sslclient.cpp
@@ -119,7 +119,7 @@ SSLClient::~SSLClient()
 
 // Read bytes from the already opened SSL connection
 int
-SSLClient::sslRead(amf::Buffer &buf)
+SSLClient::sslRead(cygnal::Buffer &buf)
 {
     GNASH_REPORT_FUNCTION;
 
@@ -142,7 +142,7 @@ SSLClient::sslRead(boost::uint8_t *buf, size_t size)
 
 // Write bytes to the already opened SSL connection
 int
-SSLClient::sslWrite(amf::Buffer &buf)
+SSLClient::sslWrite(cygnal::Buffer &buf)
 {
     GNASH_REPORT_FUNCTION;
 
diff --git a/cygnal/libnet/sslclient.h b/cygnal/libnet/sslclient.h
index 309e6bb..0502219 100644
--- a/cygnal/libnet/sslclient.h
+++ b/cygnal/libnet/sslclient.h
@@ -36,10 +36,12 @@
 #include <openssl/err.h>
 #endif
 
+#include "dsodefs.h"
 #include "cque.h"
 #include "network.h"
 #include "buffer.h"
 
+
 namespace gnash
 {
 
@@ -57,12 +59,12 @@ public:
     ~SSLClient();
 
     // Read bytes from the already opened SSL connection
-    int sslRead(amf::Buffer &buf);
+    int sslRead(cygnal::Buffer &buf);
     int sslRead(boost::uint8_t *buf, size_t length);
     int sslRead(std::string &buf);
 
     // Write bytes to the already opened SSL connection
-    int sslWrite(amf::Buffer &buf);
+    int sslWrite(cygnal::Buffer &buf);
     int sslWrite(const boost::uint8_t *buf, size_t length);
     int sslWrite(std::string &buf);
 

-----------------------------------------------------------------------

Summary of changes:
 cygnal/cygnal.h             |    3 ++-
 cygnal/libnet/sslclient.cpp |    4 ++--
 cygnal/libnet/sslclient.h   |    6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash