2 files changed, 14 insertions, 5 deletions

diff --git a/src/conf_post.h b/src/conf_post.h
index 6f48fd6d184..e21e73eb99f 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -252,12 +252,17 @@ extern int emacs_setenv_TZ (char const *);
 #endif
 
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-# define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
-   ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument))
-#else
+# ifdef __MINGW32__
+#  define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
+    ATTRIBUTE_FORMAT ((__ms_printf__, formatstring_parameter, first_argument))
+#else  /* !__MINGW32__ */
+#  define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
+    ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument))
+#endif  /* !__MINGW32__ */
+#else   /* __GNUC__ < 4.4 */
 # define ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
    ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
-#endif
+#endif  /* __GNUC__ < 4.4 */
 
 #define ATTRIBUTE_CONST _GL_ATTRIBUTE_CONST
 #define ATTRIBUTE_UNUSED _GL_UNUSED
diff --git a/src/lisp.h b/src/lisp.h
index 3c6bf3473d8..a0d0610a186 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -88,7 +88,11 @@ typedef unsigned long EMACS_UINT;
 typedef long long int EMACS_INT;
 typedef unsigned long long int EMACS_UINT;
 #  define EMACS_INT_MAX LLONG_MAX
-#  define pI "ll"
+#  ifdef __MINGW32__
+#   define pI "I64"
+#  else
+#   define pI "ll"
+#  endif
 # else
 #  error "INTPTR_MAX too large"
 # endif