diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-25 21:39:05 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-25 21:39:05 +0000 |
| commit | 995e2c04055ca8d463a0b9ae16b457972782ba7f (patch) | |
| tree | b1da59df60ef3165117e635db3b225aeeca259f3 | |
| parent | 2007-09-25 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-995e2c04055ca8d463a0b9ae16b457972782ba7f.tar.bz2 | |
2007-09-25 Joel Sherrill <joel.sherrill@OARcorp.com>
* libcsupport/src/gxx_wrappers.c, libmisc/monitor/mon-mpci.c: Use
PRId32 to fix warning.
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/libcsupport/src/gxx_wrappers.c | 8 | ||||
| -rw-r--r-- | cpukit/libmisc/monitor/mon-mpci.c | 5 |
3 files changed, 12 insertions, 6 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index f6991f5822..54900608a6 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2007-09-25 Joel Sherrill <joel.sherrill@OARcorp.com> + + * libcsupport/src/gxx_wrappers.c, libmisc/monitor/mon-mpci.c: Use + PRId32 to fix warning. + 2007-09-25 Joel Sherrill <joel.sherrill@oarcorp.com> * telnetd/passwd.h: New file. diff --git a/cpukit/libcsupport/src/gxx_wrappers.c b/cpukit/libcsupport/src/gxx_wrappers.c index 8fa17fade0..1cee8a2c16 100644 --- a/cpukit/libcsupport/src/gxx_wrappers.c +++ b/cpukit/libcsupport/src/gxx_wrappers.c @@ -53,13 +53,13 @@ typedef void *__gthread_recursive_mutex_t; /* uncomment this if you need to debug this interface */ -/* #define DEBUG_GXX_WRAPPERS 1 +/* */ #ifdef DEBUG_GXX_WRAPPERS /* local function to return the ID of the calling thread */ -static rtems_id get_tid( void ) +static rtems_id rtems_gxx_get_tid( void ) { rtems_id id = 0; rtems_task_ident( RTEMS_SELF, 0, &id ); @@ -160,7 +160,7 @@ void *rtems_gxx_getspecific(__gthread_key_t key) } #ifdef DEBUG_GXX_WRAPPERS - printk( "gxx_wrappers: getspecific key=%x, ptr=%x, id=%x\n", key, p, get_tid() ); + printk( "gxx_wrappers: getspecific key=%x, ptr=%x, id=%x\n", key, p, rtems_gxx_get_tid() ); #endif return p; } @@ -169,7 +169,7 @@ void *rtems_gxx_getspecific(__gthread_key_t key) int rtems_gxx_setspecific(__gthread_key_t key, const void *ptr) { #ifdef DEBUG_GXX_WRAPPERS - printk( "gxx_wrappers: setspecific key=%x, ptr=%x, id=%x\n", key, ptr, get_tid() ); + printk( "gxx_wrappers: setspecific key=%x, ptr=%x, id=%x\n", key, ptr, rtems_gxx_get_tid() ); #endif /* register with RTEMS the buffer that will hold the key values */ if( rtems_task_variable_add( RTEMS_SELF, (void **)key, key->dtor ) == RTEMS_SUCCESSFUL ) diff --git a/cpukit/libmisc/monitor/mon-mpci.c b/cpukit/libmisc/monitor/mon-mpci.c index 2cbd48eb3c..1853297230 100644 --- a/cpukit/libmisc/monitor/mon-mpci.c +++ b/cpukit/libmisc/monitor/mon-mpci.c @@ -16,6 +16,7 @@ #include <stdio.h> #include <stdlib.h> /* strtoul() */ +#include <inttypes.h> #define DATACOL 15 @@ -116,9 +117,9 @@ rtems_monitor_mpci_dump( uint32_t length = 0; length += rtems_monitor_pad(2, length); - length += fprintf(stdout," %d", monitor_mpci->node); + length += fprintf(stdout," %" PRId32 , monitor_mpci->node); length += rtems_monitor_pad(11, length); - length += fprintf(stdout,"%d", monitor_mpci->maximum_nodes); + length += fprintf(stdout,"%" PRId32, monitor_mpci->maximum_nodes); length += rtems_monitor_pad(18, length); length += rtems_monitor_dump_decimal(monitor_mpci->maximum_global_objects); |