Ticket #3439: vs2015.2.diff

source/lib/sysdep/os/win/wdll_delay_load.cpp

@@ -1 @@
-/* Copyright (c) 2013 Wildfire Games
+/* Copyright (c) 2016 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -36 +36 @@
 //-----------------------------------------------------------------------------
 // delay loading (modified from VC7 DelayHlp.cpp and DelayImp.h)
 
-#if MSC_VERSION && MSC_VERSION >= 1700
+#if MSC_VERSION >= 1700
 // FACILITY_VISUALCPP is already defined in winerror.h in VC2012
 # undef FACILITY_VISUALCPP
 #endif

source/lib/sysdep/os/win/wposix/wtime.h

@@ -1 @@
-/* Copyright (c) 2010 Wildfire Games
+/* Copyright (c) 2016 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -58 +58 @@
 }
 clockid_t;
 
+#if MSC_VERSION >= 1900
+# include <time.h>
+#else
 // POSIX realtime clock_*
 struct timespec
 {
     time_t tv_sec;
     long   tv_nsec;
 };
+#endif
 
 extern int nanosleep(const struct timespec* rqtp, struct timespec* rmtp);
 extern int clock_gettime(clockid_t clock, struct timespec* ts);

source/third_party/mongoose/mongoose.cpp

@@ -12 +12 @@
 //  * To avoid debug spew, we disable DEBUG.
 //  * Use memcopy to get rid of strict-aliasing warning
 //  * Remove use of deprecated 'register' storage class
+//  * Fix build for VS2015
 
 #define __STDC_LIMIT_MACROS
 
@@ -178 +179 @@
 typedef DWORD pthread_t;
 #define pid_t HANDLE // MINGW typedefs pid_t to int. Using #define here.
 
+#if defined(_MSC_VER) && _MSC_VER >= 1900
+#include <time.h>
+#elif defined(_MSC_VER)
 struct timespec {
   long tv_nsec;
   long tv_sec;
 };
+#endif
 
 static int pthread_mutex_lock(pthread_mutex_t *);
 static int pthread_mutex_unlock(pthread_mutex_t *);