[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r10749: Really fix bug #26036 (fully
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r10749: Really fix bug #26036 (fully tested now); include arpa/inet.h for htons |
Date: |
Sun, 29 Mar 2009 21:26:31 +0200 |
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 10749
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Sun 2009-03-29 21:26:31 +0200
message:
Really fix bug #26036 (fully tested now); include arpa/inet.h for htons
modified:
libamf/amf_msg.cpp
libbase/curl_adapter.cpp
------------------------------------------------------------
revno: 10748.1.1
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Sun 2009-03-29 15:08:23 +0200
message:
Include arpa/inet.h for htons, move system includes after local ones
modified:
libamf/amf_msg.cpp
=== modified file 'libamf/amf_msg.cpp'
--- a/libamf/amf_msg.cpp 2009-03-19 23:14:43 +0000
+++ b/libamf/amf_msg.cpp 2009-03-29 13:08:23 +0000
@@ -17,9 +17,6 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-#include <boost/shared_ptr.hpp>
-#include <string>
-
#include "log.h"
#include "GnashException.h"
#include "buffer.h"
@@ -27,7 +24,11 @@
#include "amf_msg.h"
#include "element.h"
#include "network.h"
-#include <boost/cstdint.hpp> // for boost::?int??_t
+
+#include <boost/shared_ptr.hpp>
+#include <string>
+#include <boost/cstdint.hpp> // For C99 int types
+#include <arpa/inet.h> // for htons
using namespace std;
using namespace gnash;
=== modified file 'libbase/curl_adapter.cpp'
--- a/libbase/curl_adapter.cpp 2009-03-28 11:44:39 +0000
+++ b/libbase/curl_adapter.cpp 2009-03-29 19:26:31 +0000
@@ -50,13 +50,20 @@
}
std::auto_ptr<IOChannel>
-NetworkAdapter::makeStream(const std::string& /*url*/,
+NetworkAdapter::makeStream(const std::string& url,
const std::string& /*postdata*/,
- const std::string& /*cachefile*/)
-{
- log_error(_("libcurl is not available, but "
- "Gnash has attempted to use the curl adapter"));
- return std::auto_ptr<IOChannel>();
+ const std::string& cachefile)
+{
+ return makeStream(url, cachefile);
+}
+
+std::auto_ptr<IOChannel>
+NetworkAdapter::makeStream(const std::string& url,
+ const std::string& /*postdata*/,
+ const RequestHeaders& /*headers*/,
+ const std::string& cachefile)
+{
+ return makeStream(url, cachefile);
}
} // namespace gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r10749: Really fix bug #26036 (fully tested now); include arpa/inet.h for htons,
Sandro Santilli <=