2010-02-01 Ozkan Sezer <sezeroz@gmail.com> * _mingw_print_pop.h: Don't undefine/redifine the inttypes.h SCN* macros, because we don't have a __mingw_scanf() family implementation yet. Ifdef'ed the relevant portions by the yet non-defined HAVE_MINGW_SCANF_IMPL macro. * _mingw_print_push.h: Likewise. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@1826 4407c894-4637-0410-b4f5-ada5f102cad1

diff --git a/mingw-w64-headers/crt/ChangeLog b/mingw-w64-headers/crt/ChangeLog
index b05e2ad..1346f5e 100644
--- a/mingw-w64-headers/crt/ChangeLog
+++ b/mingw-w64-headers/crt/ChangeLog

@@ -1,3 +1,11 @@
+2010-02-01  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* _mingw_print_pop.h: Don't undefine/redifine the inttypes.h
+	SCN* macros, because we don't have a __mingw_scanf() family
+	implementation yet. Ifdef'ed the relevant portions by the yet
+	non-defined HAVE_MINGW_SCANF_IMPL macro.
+	* _mingw_print_push.h: Likewise.
+
 2010-01-29  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* stdarg.h: Separate our stdarg.h into two, one which is the gcc-

diff --git a/mingw-w64-headers/crt/_mingw_print_pop.h b/mingw-w64-headers/crt/_mingw_print_pop.h
index 9890ed2..2ec0499 100644
--- a/mingw-w64-headers/crt/_mingw_print_pop.h
+++ b/mingw-w64-headers/crt/_mingw_print_pop.h

@@ -41,6 +41,7 @@
 #undef PRIXLEAST64
 #undef PRIXFAST64
 #undef PRIXMAX
+#ifdef HAVE_MINGW_SCANF_IMPL
 #undef SCNd64
 #undef SCNdLEAST64
 #undef SCNdFAST64
@@ -61,6 +62,7 @@
 #undef SCNuLEAST64
 #undef SCNuFAST64
 #undef SCNuMAX
+#endif /* HAVE_MINGW_SCANF_IMPL */
 #ifdef _WIN64
 #undef PRIdPTR
 #undef PRIiPTR
@@ -68,12 +70,14 @@
 #undef PRIuPTR
 #undef PRIxPTR
 #undef PRIXPTR
+#ifdef HAVE_MINGW_SCANF_IMPL
 #undef SCNdPTR
 #undef SCNiPTR
 #undef SCNoPTR
 #undef SCNxPTR
 #undef SCNuPTR
-#endif
+#endif /* HAVE_MINGW_SCANF_IMPL */
+#endif /* _WIN64 */
 
 #define PRId64 "lld"
 #define PRIdLEAST64 "lld"
@@ -99,6 +103,7 @@
 #define PRIXLEAST64 "llX"
 #define PRIXFAST64 "llX"
 #define PRIXMAX "llX"
+#ifdef HAVE_MINGW_SCANF_IMPL
 #define SCNd64 "lld"
 #define SCNdLEAST64 "lld"
 #define SCNdFAST64 "lld"
@@ -119,6 +124,7 @@
 #define SCNuLEAST64 "llu"
 #define SCNuFAST64 "llu"
 #define SCNuMAX "llu"
+#endif /* HAVE_MINGW_SCANF_IMPL */
 #ifdef _WIN64
 #define PRIdPTR "lld"
 #define PRIiPTR "lli"
@@ -126,12 +132,14 @@
 #define PRIuPTR "llu"
 #define PRIxPTR "llx"
 #define PRIXPTR "llX"
+#ifdef HAVE_MINGW_SCANF_IMPL
 #define SCNdPTR "lld"
 #define SCNiPTR "lli"
 #define SCNoPTR "llo"
 #define SCNxPTR "llx"
 #define SCNuPTR "llu"
-#endif
-#endif
+#endif /* HAVE_MINGW_SCANF_IMPL */
+#endif /* _WIN64 */
+#endif /* defined(_INTTYPES_H_) && defined(PRId64) */
 
 #endif /* defined(__USE_MINGW_ANSI_STDIO) && defined(_INC_STDIO) && __USE_MINGW_ANSI_STDIO != 0 */

diff --git a/mingw-w64-headers/crt/_mingw_print_push.h b/mingw-w64-headers/crt/_mingw_print_push.h
index b7f7664..609e6f1 100644
--- a/mingw-w64-headers/crt/_mingw_print_push.h
+++ b/mingw-w64-headers/crt/_mingw_print_push.h

@@ -41,6 +41,7 @@
 #undef PRIXLEAST64
 #undef PRIXFAST64
 #undef PRIXMAX
+#ifdef HAVE_MINGW_SCANF_IMPL
 #undef SCNd64
 #undef SCNdLEAST64
 #undef SCNdFAST64
@@ -61,6 +62,7 @@
 #undef SCNuLEAST64
 #undef SCNuFAST64
 #undef SCNuMAX
+#endif /* HAVE_MINGW_SCANF_IMPL */
 #ifdef _WIN64
 #undef PRIdPTR
 #undef PRIiPTR
@@ -68,12 +70,14 @@
 #undef PRIuPTR
 #undef PRIxPTR
 #undef PRIXPTR
+#ifdef HAVE_MINGW_SCANF_IMPL
 #undef SCNdPTR
 #undef SCNiPTR
 #undef SCNoPTR
 #undef SCNxPTR
 #undef SCNuPTR
-#endif
+#endif /* HAVE_MINGW_SCANF_IMPL */
+#endif /* _WIN64 */
 
 #define PRId64 "I64d"
 #define PRIdLEAST64 "I64d"
@@ -99,6 +103,7 @@
 #define PRIXLEAST64 "I64X"
 #define PRIXFAST64 "I64X"
 #define PRIXMAX "I64X"
+#ifdef HAVE_MINGW_SCANF_IMPL
 #define SCNd64 "I64d"
 #define SCNdLEAST64 "I64d"
 #define SCNdFAST64 "I64d"
@@ -119,6 +124,7 @@
 #define SCNuLEAST64 "I64u"
 #define SCNuFAST64 "I64u"
 #define SCNuMAX "I64u"
+#endif /* HAVE_MINGW_SCANF_IMPL */
 #ifdef _WIN64
 #define PRIdPTR "I64d"
 #define PRIiPTR "I64i"
@@ -126,13 +132,15 @@
 #define PRIuPTR "I64u"
 #define PRIxPTR "I64x"
 #define PRIXPTR "I64X"
+#ifdef HAVE_MINGW_SCANF_IMPL
 #define SCNdPTR "I64d"
 #define SCNiPTR "I64i"
 #define SCNoPTR "I64o"
 #define SCNxPTR "I64x"
 #define SCNuPTR "I64u"
-#endif
-#endif
+#endif /* HAVE_MINGW_SCANF_IMPL */
+#endif /* _WIN64 */
+#endif /* defined(_INTTYPES_H_) && defined(PRId64) */
 
 #endif /* defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO != 0 */