From f299ce8026c9f61e24ad5f4a7f7d05a4cdcd62d0 Mon Sep 17 00:00:00 2001 From: Brian Chen Date: Wed, 29 Jun 2022 15:28:27 -0700 Subject: [PATCH 1/2] guard #include when being included from c source Signed-off-by: Brian Chen --- .../include/rosidl_typesupport_c/type_support_map.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rosidl_typesupport_c/include/rosidl_typesupport_c/type_support_map.h b/rosidl_typesupport_c/include/rosidl_typesupport_c/type_support_map.h index 345a2222..a85673db 100644 --- a/rosidl_typesupport_c/include/rosidl_typesupport_c/type_support_map.h +++ b/rosidl_typesupport_c/include/rosidl_typesupport_c/type_support_map.h @@ -15,7 +15,9 @@ #ifndef ROSIDL_TYPESUPPORT_C__TYPE_SUPPORT_MAP_H_ #define ROSIDL_TYPESUPPORT_C__TYPE_SUPPORT_MAP_H_ +#ifdef __cplusplus #include +#endif #ifdef __cplusplus extern "C" From f56519cf991c8eb294bf3d10412463ac23e7580c Mon Sep 17 00:00:00 2001 From: Brian Chen Date: Wed, 6 Jul 2022 11:12:48 -0700 Subject: [PATCH 2/2] use stddef.h instead of cstddef Signed-off-by: Brian Chen --- .../include/rosidl_typesupport_c/type_support_map.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rosidl_typesupport_c/include/rosidl_typesupport_c/type_support_map.h b/rosidl_typesupport_c/include/rosidl_typesupport_c/type_support_map.h index a85673db..e2808b0c 100644 --- a/rosidl_typesupport_c/include/rosidl_typesupport_c/type_support_map.h +++ b/rosidl_typesupport_c/include/rosidl_typesupport_c/type_support_map.h @@ -15,9 +15,7 @@ #ifndef ROSIDL_TYPESUPPORT_C__TYPE_SUPPORT_MAP_H_ #define ROSIDL_TYPESUPPORT_C__TYPE_SUPPORT_MAP_H_ -#ifdef __cplusplus -#include -#endif +#include #ifdef __cplusplus extern "C"