Move resp_gc.cpp contents into gc.cpp.

git-svn-id: http://svn.drobilla.net/resp/resp@302 ad02d1e2-f140-0410-9f75-f8b11f17cedd

3 files changed, 29 insertions, 50 deletions

diff --git a/Makefile b/Makefile
index 45a0977..d76a7cc 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,6 @@ OBJECTS = \
 	build/pprint.o \
 	build/repl.o \
 	build/resp.o \
-	build/resp_gc.o \
 	build/tlsf.o \
 	build/unify.o
 
diff --git a/src/gc.cpp b/src/gc.cpp
index cff4f0a..7dd0d15 100644
--- a/src/gc.cpp
+++ b/src/gc.cpp
@@ -20,8 +20,13 @@
  */
 
 #include <cassert>
-#include <set>
 #include <iostream>
+#include <set>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "resp.hpp"
 #include "tlsf.h"
 
@@ -92,3 +97,26 @@ GC::collect(const Roots& roots)
 
 	//std::cerr << "[GC] Collect " << oldSize << " => " << _heap.size() << endl;
 }
+
+extern "C" {
+
+void*
+resp_gc_allocate(unsigned size)
+{
+	static const size_t COLLECT_SIZE = 8 * 1024 * 1024; // 8 MiB
+
+	static size_t allocated = 0;
+	allocated += size;
+	if (allocated > COLLECT_SIZE) {
+		Object::pool.collect(Object::pool.roots());
+		allocated = 0;
+	}
+
+	void* mem = Object::pool.alloc(size);
+	Object* obj = new (mem) Object();
+	obj->tag(T_UNKNOWN);
+
+	return mem;
+}
+
+}
diff --git a/src/resp_gc.cpp b/src/resp_gc.cpp
deleted file mode 100644
index 288c491..0000000
--- a/src/resp_gc.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Resp: A programming language
- * Copyright (C) 2008-2009 David Robillard <dave@drobilla.net>
- *
- * Resp is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Resp is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General
- * Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Resp.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** @file
- * @brief Garbage collection shared library interface
- */
-
-#include "resp.hpp"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-extern "C" {
-
-void*
-resp_gc_allocate(unsigned size)
-{
-	static const size_t COLLECT_SIZE = 8 * 1024 * 1024; // 8 MiB
-
-	static size_t allocated = 0;
-	allocated += size;
-	if (allocated > COLLECT_SIZE) {
-		Object::pool.collect(Object::pool.roots());
-		allocated = 0;
-	}
-
-	void* mem = Object::pool.alloc(size);
-	Object* obj = new (mem) Object();
-	obj->tag(T_UNKNOWN);
-
-	return mem;
-}
-
-}