summaryrefslogtreecommitdiffstats
path: root/testsuites/support
diff options
context:
space:
mode:
authorJoel Sherrill <joel@rtems.org>2017-04-14 15:18:56 -0500
committerJoel Sherrill <joel@rtems.org>2017-04-18 11:24:46 -0500
commitd420b679afc03f17d597193268e98966a0acd83d (patch)
treeebdae061d76c3c68e4d4c5bd63ffd6abdff71716 /testsuites/support
parentrtems/inttypes.h: New file. Uses contents from cpukit (diff)
downloadrtems-d420b679afc03f17d597193268e98966a0acd83d.tar.bz2
Merge tmacros.h PRIxxx constants from testsuites/ into <rtems/inttypes.h>
This completes the initial creation of rtems/inttypes.h based on all existing PRIxxx definitions contained in RTEMS Project owned code. closes #2983.
Diffstat (limited to 'testsuites/support')
-rw-r--r--testsuites/support/include/tmacros.h42
1 files changed, 1 insertions, 41 deletions
diff --git a/testsuites/support/include/tmacros.h b/testsuites/support/include/tmacros.h
index 4898aea046..2b267ca519 100644
--- a/testsuites/support/include/tmacros.h
+++ b/testsuites/support/include/tmacros.h
@@ -18,6 +18,7 @@
#define __TMACROS_h
#include <inttypes.h>
+#include <rtems/inttypes.h>
#include <bsp.h> /* includes <rtems.h> */
#include <ctype.h>
@@ -305,47 +306,6 @@ extern "C" {
} \
} while (0)
-/*
- * Various inttypes.h-stype macros to assist printing
- * certain system types on different targets.
- */
-
-#if defined(RTEMS_USE_16_BIT_OBJECT)
-#define PRIxrtems_id PRIx16
-#else
-#define PRIxrtems_id PRIx32
-#endif
-
-/* c.f. cpukit/score/include/rtems/score/priority.h */
-#define PRIdPriority_Control PRIu64
-#define PRIxPriority_Control PRIx64
-/* rtems_task_priority is a typedef to Priority_Control */
-#define PRIdrtems_task_priority PRIu32
-#define PRIxrtems_task_priority PRIx32
-
-/* c.f. cpukit/score/include/rtems/score/watchdog.h */
-#define PRIdWatchdog_Interval PRIu32
-/* rtems_interval is a typedef to Watchdog_Interval */
-#define PRIdrtems_interval PRIdWatchdog_Interval
-
-/* c.f. cpukit/score/include/rtems/score/thread.h */
-#define PRIdThread_Entry_numeric_type PRIuPTR
-/* rtems_task_argument is a typedef to Thread_Entry_numeric_type */
-#define PRIdrtems_task_argument PRIdThread_Entry_numeric_type
-
-/* rtems_event_set is a typedef to unit32_t */
-#define PRIxrtems_event_set PRIx32
-
-/* HACK: newlib defines pthread_t as a typedef to __uint32_t */
-/* HACK: There is no portable way to print pthread_t's */
-#define PRIxpthread_t PRIx32
-
-/* rtems_signal_set is a typedef to uint32_t */
-#define PRIxrtems_signal_set PRIx32
-
-/* newlib's ino_t is a typedef to "unsigned long" */
-#define PRIxino_t "lx"
-
/**
* This assists in clearly disabling warnings on GCC in certain very
* specific cases.