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

All: Several MSVC build fixes

This commit is contained in:
Jeffrey Pfau 2016-04-17 18:03:13 -07:00
parent f28d9d96a1
commit c689e32856
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platform/qt/Display.h
View File

@ -6,6 +6,10 @@
#ifndef QGBA_DISPLAY #ifndef QGBA_DISPLAY
#define QGBA_DISPLAY #define QGBA_DISPLAY
extern "C" {
#include "util/common.h"
}
#include <QWidget> #include <QWidget>
#include "MessagePainter.h" #include "MessagePainter.h"

2
src/platform/qt/PaletteView.h
View File

@ -13,8 +13,6 @@
#include "ui_PaletteView.h" #include "ui_PaletteView.h"
class GameController;
namespace QGBA { namespace QGBA {
class Swatch; class Swatch;

9
src/util/common.h
View File

@ -23,15 +23,22 @@
#include "version.h" #include "version.h"
#ifdef _WIN32
// WinSock2 gets very angry if it's included too late
#include <winsock2.h>
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
#include <Windows.h>
#include <sys/types.h> #include <sys/types.h>
typedef intptr_t ssize_t; typedef intptr_t ssize_t;
#define inline __inline #define PATH_MAX MAX_PATH
#define restrict __restrict #define restrict __restrict
#define strcasecmp _stricmp #define strcasecmp _stricmp
#define strncasecmp _strnicmp #define strncasecmp _strnicmp
#define ftruncate _chsize #define ftruncate _chsize
#define snprintf _snprintf #define snprintf _snprintf
#define strdup _strdup
#define lseek _lseek
#elif defined(__wii__) #elif defined(__wii__)
typedef intptr_t ssize_t; typedef intptr_t ssize_t;
#else #else

3
src/util/nointro.c
View File

@ -158,7 +158,8 @@ struct NoIntroDB* NoIntroDBLoad(struct VFile* vf) {
struct { struct {
char* key; char* key;
struct NoIntroItem* item; struct NoIntroItem* item;
} keyStack[KEY_STACK_SIZE] = {}; } keyStack[KEY_STACK_SIZE];
memset(keyStack, 0, sizeof(keyStack));
struct Table* parent = 0; struct Table* parent = 0;
size_t stackDepth = 0; size_t stackDepth = 0;

3
src/util/socket.h
View File

@ -8,12 +8,11 @@
#include "util/common.h" #include "util/common.h"
#ifdef __cplusplus #if defined(__cplusplus) && !defined(restrict)
#define restrict __restrict__ #define restrict __restrict__
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#define SOCKET_FAILED(s) ((s) == INVALID_SOCKET) #define SOCKET_FAILED(s) ((s) == INVALID_SOCKET)