From 0fe061cde1c419306bb4d3bc3542dda4d92178e7 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 30 Jul 2008 01:37:13 +0000
Subject: Fix building with language bindings.

git-svn-id: http://svn.drobilla.net/lad/ingen@1312 a436a847-0d15-0410-975c-d299462d15a1
---
 src/libs/module/World.hpp  |  5 ++---
 src/libs/module/global.cpp | 11 +----------
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'src/libs/module')

diff --git a/src/libs/module/World.hpp b/src/libs/module/World.hpp
index 29434069..f6c5a67a 100644
--- a/src/libs/module/World.hpp
+++ b/src/libs/module/World.hpp
@@ -23,19 +23,18 @@
 #include <string>
 #include <glibmm/module.h>
 #include <raul/SharedPtr.hpp>
-#include <redlandmm/World.hpp>
 #include "shared/LV2Features.hpp"
 
 #ifdef HAVE_SLV2
 #include <slv2/slv2.h>
 #endif
 
-namespace Ingen {
+namespace Redland { class World; }
 
+namespace Ingen {
 class Engine;
 
 namespace Shared {
-
 class EngineInterface;
 
 
diff --git a/src/libs/module/global.cpp b/src/libs/module/global.cpp
index a8a2720d..c78f9fc3 100644
--- a/src/libs/module/global.cpp
+++ b/src/libs/module/global.cpp
@@ -16,6 +16,7 @@
  */
 
 #include <iostream>
+#include <redlandmm/World.hpp>
 #include "global.hpp"
 #include "World.hpp"
 
@@ -37,11 +38,6 @@ get_world()
 {
     static World* world = NULL;
 
-    if (&world == NULL) {
-        cerr << "ERROR: Ingen::Shared::world undefined." << endl;
-        return NULL;
-    }
-
 	if (!world) {
 		world = new World();
         world->rdf_world = new Redland::World();
@@ -61,11 +57,6 @@ get_world()
 void
 destroy_world()
 {
-    if (&world == NULL) {
-        cerr << "ERROR: Ingen::Shared::world undefined." << endl;
-        return;
-    }
-
 	if (world) {
 #ifdef HAVE_SLV2
 		slv2_world_free(world->slv2_world);
-- 
cgit v1.2.1