From 1ebe3da136ef7a6db74cbca608bda5d110af9a8b Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 8 Feb 2011 06:38:04 +0000
Subject: [PATCH] =?UTF-8?q?2011-02-08=09Ralf=20Cors=C3=A9pius=20<ralf.cors?=
 =?UTF-8?q?epius@rtems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* include/pmacros.h: Add PRIxblksize_t, PRIxblkcnt_t.
	* configure.ac: Add AC_CHECK_SIZEOF([blksize_t]),
	AC_CHECK_SIZEOF([blkcnt_t]).
---
 testsuites/psxtests/configure.ac      |  2 ++
 testsuites/psxtests/include/pmacros.h | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac
index 07e6827998..c001e74bca 100644
--- a/testsuites/psxtests/configure.ac
+++ b/testsuites/psxtests/configure.ac
@@ -55,6 +55,8 @@ AC_CHECK_DECLS([mprotect],[],[],[[#include <sys/mman.h>]])
 
 # FIXME: We should get rid of this. It's a cludge.
 AC_CHECK_SIZEOF([off_t])
+AC_CHECK_SIZEOF([blksize_t])
+AC_CHECK_SIZEOF([blkcnt_t])
 
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
diff --git a/testsuites/psxtests/include/pmacros.h b/testsuites/psxtests/include/pmacros.h
index 378e93a6e9..921f33a271 100644
--- a/testsuites/psxtests/include/pmacros.h
+++ b/testsuites/psxtests/include/pmacros.h
@@ -101,6 +101,26 @@
 #error "unsupported size of off_t"
 #endif
 
+#if SIZEOF_BLKSIZE_T == 8
+#define PRIxblksize_t PRIx64
+#elif SIZEOF_BLKSIZE_T == 4
+#define PRIxblksize_t PRIx32
+#else
+/* Warn and fall back to "long" */
+#warning "unsupported size of blksize_t"
+#define PRIxblksize_t "lx"
+#endif
+
+#if SIZEOF_BLKSIZE_T == 8
+#define PRIxblkcnt_t PRIx64
+#elif SIZEOF_BLKSIZE_T == 4
+#define PRIxblkcnt_t PRIx32
+#else
+/* Warn and fall back to "long" */
+#warning "unsupported size of blkcnt_t"
+#define PRIxblkcnt_t "lx"
+#endif
+
 #endif
 
 /* end of file */