Skip to content

Guard against user defined major and minor macros #7074

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

Closed
miscco wants to merge 1 commit into from
Closed

Guard against user defined major and minor macros #7074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions libcudacxx/include/cuda/std/__cccl/epilogue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,4 +352,20 @@ _CCCL_DIAG_POP
# undef _CCCL_POP_MACRO_clang
#endif

// major and minor are defined in sys/sysmacros.h in libc
#if defined(major)
# error \
"cccl internal error: macro `major` was redefined between <cuda/std/__cccl/prologue.h> and <cuda/std/__cccl/epilogue.h>"
#elif defined(_CCCL_POP_MACRO_major)
# pragma pop_macro("major")
# undef _CCCL_POP_MACRO_major
#endif

#if defined(minor)
# error \
"cccl internal error: macro `minor` was redefined between <cuda/std/__cccl/prologue.h> and <cuda/std/__cccl/epilogue.h>"
#elif defined(_CCCL_POP_MACRO_minor)
# pragma pop_macro("minor")
# undef _CCCL_POP_MACRO_minor
#endif
// NO include guards here (this file is included multiple times)
13 changes: 13 additions & 0 deletions libcudacxx/include/cuda/std/__cccl/prologue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,19 @@
# define _CCCL_POP_MACRO_clang
#endif // defined(clang)

// major and minor are defined in sys/sysmacros.h in libc
#if defined(major)
# pragma push_macro("major")
# undef clang
# define _CCCL_POP_MACRO_major
#endif // defined(major)

#if defined(minor)
# pragma push_macro("minor")
# undef clang
# define _CCCL_POP_MACRO_minor
#endif // defined(minor)

_CCCL_DIAG_PUSH
_CCCL_NV_DIAG_PUSH()

Expand Down
Loading