瀏覽代碼

Merge pull request #8287 from karroffel/dlscript-android-fix

[DLScript] fixed android builds now
Rémi Verschelde 8 年之前
父節點
當前提交
243849583a
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/unix/os_unix.cpp
  2. 1 1
      modules/dlscript/godot/godot_string.cpp

+ 1 - 1
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());

+ 1 - 1
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" {