Ticket #3439: vs2015.diff

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

@@ -1 @@
-/* Copyright (c) 2013 Wildfire Games
+/* Copyright (c) 2015 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

@@ -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);