Skip to content

fix: prevent char16_t redefinition on macOS #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: rolling
Choose a base branch
from
Open

fix: prevent char16_t redefinition on macOS #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f16b0b
fix: prevent char16_t redefinition on macOS
artcore-c May 31, 2025
21ee2c2
Add files via upload
artcore-c Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions include/rosidl_dynamic_typesupport/uchar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,13 @@ extern "C" {
#endif

#if defined(__ROSIDL_DYNAMIC_TYPESUPPORT__UCHAR_H__NEEDS_CHAR16_T_DECL)
# undef __ROSIDL_DYNAMIC_TYPESUPPORT__UCHAR_H__NEEDS_CHAR16_T_DECL
# include <stdint.h>
#undef __ROSIDL_DYNAMIC_TYPESUPPORT__UCHAR_H__NEEDS_CHAR16_T_DECL
#include <stdint.h>
#ifndef __cplusplus
typedef uint_least16_t char16_t;
#endif
#endif



#ifdef __cplusplus
Expand Down
12 changes: 12 additions & 0 deletions overrides/rosidl_dynamic_typesupport/include/rosidl_dynamic_typesupport/char16_t_fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- a/rosidl_dynamic_typesupport/include/rosidl_dynamic_typesupport/uchar.h
Copy link

@ahcorde ahcorde Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this file used somewhere ?

+++ b/rosidl_dynamic_typesupport/include/rosidl_dynamic_typesupport/uchar.h
@@ -42,7 +42,9 @@
# else
// Otherwise assume that char16_t isn't defined anywhere, and define it ourselves as uint_least16_t.
# define __ROSIDL_DYNAMIC_TYPESUPPORT__UCHAR_H__NEEDS_CHAR16_T_DECL
+# if !defined(__CHAR16_TYPE__)
typedef uint_least16_t char16_t;
+# endif
# endif
# else
# define __ROSIDL_DYNAMIC_TYPESUPPORT__UCHAR_H__NEEDS_CHAR16_T_DECL