summaryrefslogtreecommitdiffstats
path: root/cpukit/include/rtems/score/object.h
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-10-25 12:05:53 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-10-29 10:33:33 +0100
commit70382718450c6b5d83232188cc71b6c795048a27 (patch)
tree454cdea0181e12e183532d24cc7483fa28c9a09e /cpukit/include/rtems/score/object.h
parentscore: Remove bogus thread object name support (diff)
downloadrtems-70382718450c6b5d83232188cc71b6c795048a27.tar.bz2
Remove RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES
Enable support for string objects names unconditionally. Add const qualifier throughout. Split _Objects_Namespace_remove() into _Objects_Namespace_remove_u32() and _Objects_Namespace_remove_string() to avoid an unnecessary dependency on _Workspace_Free(). Update #2514.
Diffstat (limited to 'cpukit/include/rtems/score/object.h')
-rw-r--r--cpukit/include/rtems/score/object.h16
1 files changed, 2 insertions, 14 deletions
diff --git a/cpukit/include/rtems/score/object.h b/cpukit/include/rtems/score/object.h
index 6789c61fea..adafcaa72d 100644
--- a/cpukit/include/rtems/score/object.h
+++ b/cpukit/include/rtems/score/object.h
@@ -36,16 +36,6 @@ extern "C" {
*/
/**@{*/
-#if defined(RTEMS_POSIX_API)
- /**
- * This macro is defined when an API is enabled that requires the
- * use of strings for object names. Since the Classic API uses
- * 32-bit unsigned integers and not strings, this allows us to
- * disable this in the smallest RTEMS configuratinos.
- */
- #define RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES
-#endif
-
/**
* @defgroup ScoreCPU CPU Architecture Support
*
@@ -67,10 +57,8 @@ extern "C" {
* object names.
*/
typedef union {
- #if defined(RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES)
- /** This is a pointer to a string name. */
- const char *name_p;
- #endif
+ /** This is a pointer to a string name. */
+ const char *name_p;
/** This is the actual 32-bit "raw" integer name. */
uint32_t name_u32;
} Objects_Name;