3 files changed, 9 insertions, 2 deletions
diff --git a/core/os/input.h b/core/os/input.h
index 8aa0e6b18..d81ebf4ec 100644
--- a/core/os/input.h
+++ b/core/os/input.h
@@ -62,7 +62,7 @@ public:
 
 	virtual float get_joy_axis(int p_device,int p_axis)=0;
 	virtual String get_joy_name(int p_idx)=0;
-	virtual void joy_connection_changed(int p_idx, bool p_connected, String p_name)=0;
+	virtual void joy_connection_changed(int p_idx, bool p_connected, String p_name, String p_guid)=0;
 
 
 	virtual Point2 get_mouse_pos() const=0;
diff --git a/core/os/thread.cpp b/core/os/thread.cpp
index 96b0f561c..53db62c17 100644
--- a/core/os/thread.cpp
+++ b/core/os/thread.cpp
@@ -58,6 +58,11 @@ void Thread::wait_to_finish(Thread *p_thread) {
 		
 }
 
+Error Thread::set_name(const String &p_name) {
+
+	return ERR_UNAVAILABLE;
+};
+
 Thread::Thread()
 {
 }
diff --git a/core/os/thread.h b/core/os/thread.h
index 590fee1fc..e3d00b039 100644
--- a/core/os/thread.h
+++ b/core/os/thread.h
@@ -35,6 +35,7 @@
 	@author Juan Linietsky <reduzio@gmail.com>
 */
 
+#include "ustring.h"
 
 typedef void (*ThreadCreateCallback)(void *p_userdata);
 
@@ -71,7 +72,8 @@ protected:
 	Thread();
 public:
 		
-	
+
+	virtual Error set_name(const String& p_name);
 		
 	virtual ID get_ID() const=0;