summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2010-12-15 07:03:28 +0000
committerDavid Robillard <d@drobilla.net>2010-12-15 07:03:28 +0000
commitfab5b6794bd156389009a05d10981a265278477e (patch)
tree5cbf03b43a382fa1ac8a156864e6f56554815b0e /src/engine
parent2cfd996c38fefef9052c12758d681cba7be0642e (diff)
downloadingen-fab5b6794bd156389009a05d10981a265278477e.tar.gz
ingen-fab5b6794bd156389009a05d10981a265278477e.tar.bz2
ingen-fab5b6794bd156389009a05d10981a265278477e.zip
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
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/HTTPEngineReceiver.cpp12
-rw-r--r--src/engine/HTTPEngineReceiver.hpp9
2 files changed, 16 insertions, 5 deletions
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