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

VS2015: Fix w32pthreads and xpad

This commit is contained in:
Miguel A. Colón Vélez 2015-08-01 03:12:47 -04:00 committed by Gregory Hainaut
parent 9d1674db99
commit e20768d257
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/w32pthreads/include/pthread.h vendored
View File

@ -118,6 +118,10 @@
# pragma comment(lib, "pthread") # pragma comment(lib, "pthread")
#endif #endif
#if _MSC_VER >= 1900
# define HAVE_STRUCT_TIMESPEC 1
#endif
/* /*
* ------------------------------------------------------------- * -------------------------------------------------------------
* *

2
plugins/xpad/stdafx.h
View File

@ -49,10 +49,8 @@
#include <vector> #include <vector>
#include <list> #include <list>
#include <map> #include <map>
#include <hash_map>
using namespace std; using namespace std;
using namespace stdext;
extern string format(const char* fmt, ...); extern string format(const char* fmt, ...);