From fab5b6794bd156389009a05d10981a265278477e Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 15 Dec 2010 07:03:28 +0000
Subject: Keep soup.h include local, to keep netdb.h include away from glibmm
 include to avoid clashing symbol HOST_NOT_FOUND (fix ticket #328). Yes, this
 is as mind-blowingly stupid of a thing to have to work around as it seems.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2704 a436a847-0d15-0410-975c-d299462d15a1
---
 src/client/HTTPClientReceiver.cpp | 10 ++++++++--
 src/client/HTTPClientReceiver.hpp |  4 +++-
 src/client/HTTPEngineSender.cpp   |  4 +++-
 src/client/HTTPEngineSender.hpp   |  8 ++++++--
 src/engine/HTTPEngineReceiver.cpp | 12 +++++++++---
 src/engine/HTTPEngineReceiver.hpp |  9 +++++++--
 6 files changed, 36 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/client/HTTPClientReceiver.cpp b/src/client/HTTPClientReceiver.cpp
index 9a00330e..caabd20d 100644
--- a/src/client/HTTPClientReceiver.cpp
+++ b/src/client/HTTPClientReceiver.cpp
@@ -15,14 +15,20 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <list>
+#include <errno.h>
+
 #include <cassert>
 #include <cstring>
+#include <list>
 #include <sstream>
+
 #include <sys/socket.h>
-#include <errno.h>
+
+#include <libsoup/soup.h>
+
 #include "raul/log.hpp"
 #include "raul/Atom.hpp"
+
 #include "module/Module.hpp"
 #include "module/World.hpp"
 #include "HTTPClientReceiver.hpp"
diff --git a/src/client/HTTPClientReceiver.hpp b/src/client/HTTPClientReceiver.hpp
index b0987960..094eee65 100644
--- a/src/client/HTTPClientReceiver.hpp
+++ b/src/client/HTTPClientReceiver.hpp
@@ -20,7 +20,6 @@
 
 #include <cstdlib>
 #include <boost/utility.hpp>
-#include <libsoup/soup.h>
 #include <glibmm/thread.h>
 #include "redlandmm/World.hpp"
 #include "raul/Deletable.hpp"
@@ -29,6 +28,9 @@
 #include "interface/ClientInterface.hpp"
 #include "serialisation/Parser.hpp"
 
+typedef struct _SoupSession SoupSession;
+typedef struct _SoupMessage SoupMessage;
+
 namespace Ingen {
 namespace Client {
 
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp
index 1c45a2c2..c1261102 100644
--- a/src/client/HTTPEngineSender.cpp
+++ b/src/client/HTTPEngineSender.cpp
@@ -16,9 +16,11 @@
  */
 
 #include <libsoup/soup.h>
-#include "raul/log.hpp"
+
 #include "raul/AtomRDF.hpp"
+#include "raul/log.hpp"
 #include "redlandmm/Model.hpp"
+
 #include "module/World.hpp"
 #include "HTTPEngineSender.hpp"
 #include "HTTPClientReceiver.hpp"
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index fedcd4fd..bd8d3e23 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -19,12 +19,16 @@
 #define INGEN_CLIENT_HTTPENGINESENDER_HPP
 
 #include <inttypes.h>
+
 #include <string>
-#include <libsoup/soup.h>
+
 #include "raul/Path.hpp"
-#include "interface/EngineInterface.hpp"
 #include "redlandmm/World.hpp"
 
+#include "interface/EngineInterface.hpp"
+
+typedef struct _SoupSession SoupSession;
+
 namespace Ingen {
 
 namespace Shared { class World; }
diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/engine/HTTPEngineReceiver.cpp
index 8d998440..9982b97e 100644
--- a/src/engine/HTTPEngineReceiver.cpp
+++ b/src/engine/HTTPEngineReceiver.cpp
@@ -15,23 +15,29 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <string>
+
 #include <boost/format.hpp>
-#include "raul/log.hpp"
+
+#include <libsoup/soup.h>
+
 #include "raul/Atom.hpp"
 #include "raul/SharedPtr.hpp"
+#include "raul/log.hpp"
+
 #include "interface/ClientInterface.hpp"
 #include "module/Module.hpp"
 #include "serialisation/Parser.hpp"
 #include "serialisation/Serialiser.hpp"
+
 #include "ClientBroadcaster.hpp"
 #include "Engine.hpp"
 #include "EngineStore.hpp"
+#include "EventSource.hpp"
 #include "HTTPClientSender.hpp"
 #include "HTTPEngineReceiver.hpp"
-#include "EventSource.hpp"
 #include "ThreadManager.hpp"
 
 #define LOG(s) s << "[HTTPEngineReceiver] "
diff --git a/src/engine/HTTPEngineReceiver.hpp b/src/engine/HTTPEngineReceiver.hpp
index a8529569..8c922e3d 100644
--- a/src/engine/HTTPEngineReceiver.hpp
+++ b/src/engine/HTTPEngineReceiver.hpp
@@ -18,11 +18,16 @@
 #ifndef INGEN_ENGINE_HTTPENGINERECEIVER_HPP
 #define INGEN_ENGINE_HTTPENGINERECEIVER_HPP
 
-#include <string>
 #include <stdint.h>
-#include <libsoup/soup.h>
+
+#include <string>
+
 #include "QueuedEngineInterface.hpp"
 
+typedef struct _SoupServer SoupServer;
+typedef struct _SoupMessage SoupMessage;
+typedef struct SoupClientContext SoupClientContext;
+
 namespace Ingen {
 
 class HTTPEngineReceiver : public QueuedEngineInterface
-- 
cgit v1.2.1