diff --git a/src/os_mswin.c b/src/os_mswin.c
index 49b1428..839c3df 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -1781,7 +1781,7 @@
 }
 
 /* Attempt to make this work for old and new compilers */
-#if !defined(_MSC_VER) || (_MSC_VER < 1300) || !defined(INT_PTR)
+#if !defined(_WIN64) && (!defined(_MSC_VER) || _MSC_VER < 1300)
 # define PDP_RETVAL BOOL
 #else
 # define PDP_RETVAL INT_PTR
diff --git a/src/version.c b/src/version.c
index 2837018..9289490 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    322,
+/**/
     321,
 /**/
     320,