Fix multiple definition errors

Also add missing <string> header.
binji · Jul 24, 2020 · 20d2503 · 20d2503
1 parent 1ce3121
commit 20d2503
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/debugger/debugger.h b/src/debugger/debugger.h
@@ -9,6 +9,7 @@
 #define BINJGB_DEBUGGER_H__
 
 #include <array>
+#include <string>
 
 #include "imgui.h"
 #include "imgui_memory_editor.h"

diff --git a/src/host-gl.c b/src/host-gl.c
@@ -8,6 +8,10 @@
 
 #include <assert.h>
 
+#define V(name, type) type name;
+FOREACH_GLEXT_PROC(V)
+#undef V
+
 #define CHECK_LOG(var, kind, status_enum, kind_str)      \
   do {                                                   \
     GLint status;                                        \

diff --git a/src/host-gl.h b/src/host-gl.h
@@ -41,7 +41,7 @@ extern "C" {
   V(glUseProgram, PFNGLUSEPROGRAMPROC)                           \
   V(glVertexAttribPointer, PFNGLVERTEXATTRIBPOINTERPROC)
 
-#define V(name, type) type name;
+#define V(name, type) extern type name;
 FOREACH_GLEXT_PROC(V)
 #undef V