--- old/jdk/src/java.instrument/share/native/libinstrument/Reentrancy.c	2015-12-16 14:33:48.829356098 +0100
+++ new/jdk/src/java.instrument/share/native/libinstrument/Reentrancy.c	2015-12-16 14:33:48.665356096 +0100
@@ -90,7 +90,11 @@
                 jthread         thread,
                 const void *    expected) {
     jvmtiError  error;
+#if defined _WIN32 && _MSC_VER >= 1900
+    void *      test = (void *)(uintptr_t) 0x99999999;
+#else
     void *      test = (void *) 0x99999999;
+#endif
 
     /* now check if we do a fetch we get what we wrote */
     error = (*jvmtienv)->GetThreadLocalStorage(