summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2010-04-26 00:50:15 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2010-04-26 00:50:15 +0000
commitc0c56351642ec04bea1f596464fdcc2630295e94 (patch)
tree4916f5b920c9595fd4c3317013d8808f164a09af /cpukit
parent2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff)
downloadrtems-c0c56351642ec04bea1f596464fdcc2630295e94.tar.bz2
2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com>
* libmisc/stringto/stringto_template.h: Remove warning.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog4
-rw-r--r--cpukit/libmisc/stringto/stringto_template.h6
2 files changed, 9 insertions, 1 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 9f2645d753..43e3a5c711 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ * libmisc/stringto/stringto_template.h: Remove warning.
+
2010-04-25 Joel Sherrill <joel.sherrill@oarcorp.com>
* posix/src/pthread.c: Make default pthread_attr_t match the
diff --git a/cpukit/libmisc/stringto/stringto_template.h b/cpukit/libmisc/stringto/stringto_template.h
index 2622444c40..6bc61c9c04 100644
--- a/cpukit/libmisc/stringto/stringto_template.h
+++ b/cpukit/libmisc/stringto/stringto_template.h
@@ -127,7 +127,11 @@ rtems_status_code STRING_TO_NAME (
return RTEMS_INVALID_NUMBER;
#endif
- *n = (STRING_TO_TYPE) result;
+ #if defined(STRING_TO_POINTER)
+ *n = (STRING_TO_TYPE) (uintptr_t)result;
+ #else
+ *n = (STRING_TO_TYPE) result;
+ #endif
return RTEMS_SUCCESSFUL;
}