Index: generic/nsf.c
===================================================================
diff -u -r6ebbaeeee26137ccd4aaa4d6044de2c76adf7f98 -rd7bc5d6344a2648519087a1450071b28660b9977
--- generic/nsf.c	(.../nsf.c)	(revision 6ebbaeeee26137ccd4aaa4d6044de2c76adf7f98)
+++ generic/nsf.c	(.../nsf.c)	(revision d7bc5d6344a2648519087a1450071b28660b9977)
@@ -6752,7 +6752,8 @@
     if (nsPtr->deleteProc || nsPtr->clientData) {
       Tcl_Panic("Namespace '%s' exists already with delProc 0x%" PRIxPTR " and clientData %p; "
                 "Can only convert a plain Tcl namespace into an NSF namespace, my delete proc 0x%" PRIxPTR,
-                name, PTR2UINT(nsPtr->deleteProc), nsPtr->clientData, PTR2UINT(NSNamespaceDeleteProc));
+                name, (unsigned long)PTR2UINT(nsPtr->deleteProc),
+                nsPtr->clientData, (unsigned long)PTR2UINT(NSNamespaceDeleteProc));
     }
 
     {
Index: generic/nsfInt.h
===================================================================
diff -u -rdea74ea71d9442e370e083ca2d8417c66585afea -rd7bc5d6344a2648519087a1450071b28660b9977
--- generic/nsfInt.h	(.../nsfInt.h)	(revision dea74ea71d9442e370e083ca2d8417c66585afea)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision d7bc5d6344a2648519087a1450071b28660b9977)
@@ -46,6 +46,29 @@
 #ifndef _nsf_int_h_
 #define _nsf_int_h_
 
+/*
+ * Well behaved compiler with C99 support should define __STDC_VERSION__
+ */
+#if defined(__STDC_VERSION__)
+# if __STDC_VERSION__ >= 199901L
+#  define NSF_HAVE_C99
+# endif
+#endif
+
+/*
+ * Starting with Visual Studio 2013, Microsoft provides C99 library support.
+ */
+#if (!defined(NSF_HAVE_C99)) && defined(_MSC_VER) && (_MSC_VER >= 1800)
+# define NSF_HAVE_C99
+#endif
+
+#if defined(_MSC_VER) && _MSC_VER < 1800
+# undef HAVE_INTTYPES_H
+#else
+# define HAVE_INTTYPES_H 1
+#include <inttypes.h>
+#endif
+
 #if !defined(HAVE_INTTYPES_H)
 # if !defined(__PRIPTR_PREFIX)
 #  if defined(_LP64) || defined(_I32LPx) || defined(HAVE_64BIT) || defined(_WIN64) || defined(_WIN32)
@@ -63,23 +86,8 @@
 # endif
 #endif
 
-/*
- * Well behaved compiler with C99 support should define __STDC_VERSION__
- */
-#if defined(__STDC_VERSION__)
-# if __STDC_VERSION__ >= 199901L
-#  define NSF_HAVE_C99
-# endif
-#endif
 
 /*
- * Starting with Visual Studio 2013, Microsoft provides C99 library support.
- */
-#if (!defined(NSF_HAVE_C99)) && defined(_MSC_VER) && (_MSC_VER >= 1800)
-# define NSF_HAVE_C99
-#endif
-
-/*
  * Boolean type "bool" and constants
  */
 #ifdef NSF_HAVE_C99