ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into qt

This commit is contained in:
Jeffrey Pfau 2014-07-20 16:38:00 -07:00
parent f62ccde49d d48dad27d1
commit 4da65d0f2f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/debugger/debugger.h
View File

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

4
src/util/socket.h
View File

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