Skip to content
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

Jump to bottom

Avoid pascal macro conflict when working on mingw #325

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid pascal macro conflict when working on mingw #325

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
9 changes: 9 additions & 0 deletions include/units.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@
# endif // _MSC_VER < 1800
#endif // _MSC_VER

#if defined(__MINGW64__) || defined(__MINGW32__)
# pragma push_macro("pascal")
# undef pascal
#endif // __MINGW64__ or __MINGW32__

#if !defined(_MSC_VER) || _MSC_VER > 1800
# define UNIT_HAS_LITERAL_SUPPORT
# define UNIT_HAS_VARIADIC_TEMPLATE_SUPPORT
Expand Down Expand Up @@ -4871,6 +4876,10 @@ namespace std
# pragma pop_macro("pascal")
#endif // _MSC_VER

#if defined(__MINGW64__) || defined(__MINGW32__)
# pragma pop_macro("pascal")
#endif // __MINGW64__ or __MINGW32__

#endif // units_h__

// For Emacs
Expand Down