summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/os_mswin.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 49b142895b..839c3df5b5 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -1781,7 +1781,7 @@ swap_me(COLORREF colorref)
}
/* 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 2837018f9d..9289490dc2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 322,
+/**/
321,
/**/
320,