[rtems commit] rtems: Move declartion of _RTEMS_version
Sebastian Huber
sebh at rtems.org
Tue Jul 14 05:26:19 UTC 2020
Module: rtems
Branch: master
Commit: 90390118c0eaa76da6f98ee81f775391b7bfb695
Changeset: http://git.rtems.org/rtems/commit/?id=90390118c0eaa76da6f98ee81f775391b7bfb695
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Mon May 11 08:20:48 2020 +0200
rtems: Move declartion of _RTEMS_version
Close #3978.
---
cpukit/include/rtems/score/copyrt.h | 10 ++++++++++
cpukit/include/rtems/system.h | 6 ------
cpukit/sapi/src/getversionstring.c | 3 +--
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/cpukit/include/rtems/score/copyrt.h b/cpukit/include/rtems/score/copyrt.h
index c7b00b4..1d0ad09 100644
--- a/cpukit/include/rtems/score/copyrt.h
+++ b/cpukit/include/rtems/score/copyrt.h
@@ -41,6 +41,16 @@ extern "C" {
*/
extern const char _Copyright_Notice[];
+/**
+ * @brief This constant provides the RTEMS version string.
+ *
+ * The constant name does not follow the naming conventions. Do not change it
+ * for backward compatibility reasons.
+ *
+ * @see rtems_get_version_string()
+ */
+extern const char _RTEMS_version[];
+
#ifdef __cplusplus
}
#endif
diff --git a/cpukit/include/rtems/system.h b/cpukit/include/rtems/system.h
index 032ac56..3a2dff9 100644
--- a/cpukit/include/rtems/system.h
+++ b/cpukit/include/rtems/system.h
@@ -39,12 +39,6 @@ extern "C" {
#ifndef ASM
-/*
- * The use of this variable is deprecated, use rtems_get_version_string()
- * instead.
- */
-extern RTEMS_DEPRECATED const char _RTEMS_version[];
-
/**
* The following is the extern for the RTEMS copyright string.
*/
diff --git a/cpukit/sapi/src/getversionstring.c b/cpukit/sapi/src/getversionstring.c
index f3fada9..a036fe2 100644
--- a/cpukit/sapi/src/getversionstring.c
+++ b/cpukit/sapi/src/getversionstring.c
@@ -19,9 +19,8 @@
#include "config.h"
#endif
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
#include <rtems.h>
+#include <rtems/score/copyrt.h>
const char *rtems_get_version_string(void)
{
More information about the vc
mailing list