Changeset 438ca2f in rtems

Timestamp:

Apr 22, 2017, 7:15:22 PM (4 years ago)

Author:

Joel Sherrill <joel@…>

Branches:

5, master

Children:

9ed3266

Parents:

8ed5889f

Message:

rtems/inttypes.h: Add blksize_t and blkcnt_t

Files:

• cpukit/configure.ac (modified) (2 diffs)
• cpukit/include/rtems/inttypes.h (modified) (1 diff)
• testsuites/psxtests/include/pmacros.h (modified) (2 diffs)

cpukit/configure.ac

@@ -244 +244 @@
 AC_CHECK_SIZEOF([time_t])
 AC_CHECK_SIZEOF([size_t])
+AC_CHECK_SIZEOF([blksize_t])
+AC_CHECK_SIZEOF([blkcnt_t])
 
 ## Provide sizeof(mode_t) information via cpuopts.h
@@ -262 +264 @@
   [${ac_cv_sizeof_time_t}],
   [sizeof(time_t)])
+
+## Provide sizeof(blksize_t) information via cpuopts.h
+RTEMS_CPUOPT([__RTEMS_SIZEOF_BLKSIZE_T__],
+  [true],
+  [${ac_cv_sizeof_blksize_t}],
+  [sizeof(blksize_t)])
+
+## Provide sizeof(blkcnt_t) information via cpuopts.h
+RTEMS_CPUOPT([__RTEMS_SIZEOF_BLKCNT_T__],
+  [true],
+  [${ac_cv_sizeof_blkcnt_t}],
+  [sizeof(blkcnt_t)])
 
 ## Then we propagate a private copy of the value into cpuopts.h

cpukit/include/rtems/inttypes.h

@@ -71 +71 @@
 #endif
 
+/** Helper macro to print "blksize_t" in decimal */
+#if __RTEMS_SIZEOF_BLKSIZE_T__ == 8
+#define PRIxblksize_t PRIx64
+#elif __RTEMS_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
+
+/** Helper macro to print "blkcnt_t" in decimal */
+#if __RTEMS_SIZEOF_BLKCNT_T__ == 8
+#define PRIxblkcnt_t PRIx64
+#elif __RTEMS_SIZEOF_BLKCNT_T__ == 4
+#define PRIxblkcnt_t PRIx32
+#else
+/* Warn and fall back to "long" */
+#warning "unsupported size of blkcnt_t"
+#define PRIxblkcnt_t "lx"
+#endif
+
 /*
  * Various inttypes.h-stype macros to assist printing

testsuites/psxtests/include/pmacros.h

@@ -1 +1 @@
 /*
- *  COPYRIGHT (c) 1989-2009.
+ *  COPYRIGHT (c) 1989-2009, 2017.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -92 +92 @@
 #define empty_line() puts( "" )
 
-#if SIZEOF_OFF_T == 8
-#define PRIdoff_t PRIo64
-#elif SIZEOF_OFF_T == 4
-#define PRIdoff_t PRIo32
-#else
-#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