M src/debugger/debugger.h → src/debugger/debugger.h

@@ -5,7 +5,7 @@ #include "common.h"
 
 #include "arm.h"
 
-const uint32_t ARM_DEBUGGER_ID;
+extern const uint32_t ARM_DEBUGGER_ID;
 
 enum DebuggerState {
 	DEBUGGER_PAUSED,

M src/util/socket.h → src/util/socket.h

@@ -3,6 +3,10 @@ #define SOCKET_H
 
 #include "common.h"
 
+#ifdef __cplusplus
+#define restrict __restrict__
+#endif
+
 #ifdef _WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>