From e20768d257ec06b663f52652ed98c07fa22c4e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20A=2E=20Col=C3=B3n=20V=C3=A9lez?= Date: Sat, 1 Aug 2015 03:12:47 -0400 Subject: [PATCH] VS2015: Fix w32pthreads and xpad --- 3rdparty/w32pthreads/include/pthread.h | 4 ++++ plugins/xpad/stdafx.h | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/3rdparty/w32pthreads/include/pthread.h b/3rdparty/w32pthreads/include/pthread.h index 4c22939488..3ad5bfd780 100644 --- a/3rdparty/w32pthreads/include/pthread.h +++ b/3rdparty/w32pthreads/include/pthread.h @@ -118,6 +118,10 @@ # pragma comment(lib, "pthread") #endif +#if _MSC_VER >= 1900 +# define HAVE_STRUCT_TIMESPEC 1 +#endif + /* * ------------------------------------------------------------- * diff --git a/plugins/xpad/stdafx.h b/plugins/xpad/stdafx.h index 12856d5c4d..37e997a3cf 100644 --- a/plugins/xpad/stdafx.h +++ b/plugins/xpad/stdafx.h @@ -49,10 +49,8 @@ #include #include #include -#include using namespace std; -using namespace stdext; extern string format(const char* fmt, ...);