summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarroffel <therzog@mail.de>2017-04-06 14:00:54 +0200
committerKarroffel <therzog@mail.de>2017-04-06 14:00:54 +0200
commit741800f5cc852ffd04088d5ee779a8c9421c65a7 (patch)
tree57c6e63d7150e86fead5a51996ecc80731d69893
parentab02206f18a08d22399784259fe558fe104c0ed5 (diff)
[DLScript] fixed android builds now
... really.
-rw-r--r--drivers/unix/os_unix.cpp2
-rw-r--r--modules/dlscript/godot/godot_string.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index 6e0674d060..ea765e8f8a 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -453,7 +453,7 @@ Error OS_Unix::close_dynamic_library(void *p_library_handle) {
}
Error OS_Unix::get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle) {
- char *error;
+ const char *error;
dlerror(); // Clear existing errors
p_symbol_handle = dlsym(p_library_handle, p_name.utf8().get_data());
diff --git a/modules/dlscript/godot/godot_string.cpp b/modules/dlscript/godot/godot_string.cpp
index 43f05500fd..97d0985a50 100644
--- a/modules/dlscript/godot/godot_string.cpp
+++ b/modules/dlscript/godot/godot_string.cpp
@@ -3,7 +3,7 @@
#include "string_db.h"
#include "ustring.h"
-#include <memory.h>
+#include <string.h>
#ifdef __cplusplus
extern "C" {