I committed 1, 2, and 5 to 4.11 and master. The ticket closed with 5. Once the questions about 3 and 4 are answered, then I will apply those.
On 9/2/2015 4:54 PM, Martin Galvan wrote:
Updates #2405. --- c/src/lib/libbsp/shared/umon/umon.h | 4 ++++ cpukit/posix/include/rtems/posix/ptimer.h | 5 ++++- cpukit/rtems/include/rtems/rtems/dpmemimpl.h | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/c/src/lib/libbsp/shared/umon/umon.h b/c/src/lib/libbsp/shared/umon/umon.h index 3c5bdf9..d25a781 100644 --- a/c/src/lib/libbsp/shared/umon/umon.h +++ b/c/src/lib/libbsp/shared/umon/umon.h @@ -61,4 +61,8 @@ int rtems_initialize_tfs_filesystem( */ int umoncons_poll_read(int minor); +#ifdef __cplusplus +} #endif + +#endif /* __rtems_umon_h */ diff --git a/cpukit/posix/include/rtems/posix/ptimer.h b/cpukit/posix/include/rtems/posix/ptimer.h index 7cc0516..16ac2b8 100644 --- a/cpukit/posix/include/rtems/posix/ptimer.h +++ b/cpukit/posix/include/rtems/posix/ptimer.h @@ -87,6 +87,9 @@ int timer_getoverrun( timer_t timerid ); +#ifdef __cplusplus +} +#endif /** @} */ -#endif +#endif /* _RTEMS_POSIX_PTIMER_H */ diff --git a/cpukit/rtems/include/rtems/rtems/dpmemimpl.h b/cpukit/rtems/include/rtems/rtems/dpmemimpl.h index 9fd2e6c..3e0c231 100644 --- a/cpukit/rtems/include/rtems/rtems/dpmemimpl.h +++ b/cpukit/rtems/include/rtems/rtems/dpmemimpl.h @@ -20,6 +20,10 @@ #include <rtems/rtems/dpmem.h> #include <rtems/score/objectimpl.h> +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup ClassicDPMEMImpl Dual Ported Memory Manager Implementation * @@ -104,5 +108,5 @@ RTEMS_INLINE_ROUTINE Dual_ported_memory_Control *_Dual_ported_memory_Get ( } #endif -#endif +#endif /* _RTEMS_RTEMS_DPMEM_INL */ /* end of include file */
-- Joel Sherrill, Ph.D. Director of Research & Development joel.sherr...@oarcorp.com On-Line Applications Research Ask me about RTEMS: a free RTOS Huntsville AL 35805 Support Available (256) 722-9985 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel