Fix how header template works to prevent double-inclusion (#117)

Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>

Author: mjcarroll

rosidl_typesupport_fastrtps_cpp/include/rosidl_typesupport_fastrtps_cpp/message_type_support.h

@@ -17,7 +17,7 @@
 
 #include <cstddef>
 
-#include <fastcdr/Cdr.h>
+#include "fastcdr/Cdr.h"
 
 #include "rosidl_runtime_c/message_type_support_struct.h"
 

rosidl_typesupport_fastrtps_cpp/resource/msg__rosidl_typesupport_fastrtps_cpp.hpp.em

@@ -7,21 +7,25 @@ include_parts = [package_name] + list(interface_path.parents[0].parts) + [
 include_base = '/'.join(include_parts)
 
 header_files = [
+    'cstddef',
     'rosidl_runtime_c/message_type_support_struct.h',
     'rosidl_typesupport_interface/macros.h',
     package_name + '/msg/rosidl_typesupport_fastrtps_cpp__visibility_control.h',
     include_base + '__struct.hpp',
 ]
 }@
-#include <cstddef>
 @[for header_file in header_files]@
 @[    if header_file in include_directives]@
 // already included above
 // @
 @[    else]@
 @{include_directives.add(header_file)}@
 @[    end if]@
+@[    if '/' not in header_file]@
+#include <@(header_file)>
+@[    else]@
 #include "@(header_file)"
+@[    end if]@
 @[end for]@
 
 #ifndef _WIN32