Skip to content

A
angle
Commit a2ade894 by John Plate Committed by Commit Bot
Options

Clear macros 'NEAR' and 'FAR'

Bug: angleproject:5861 Change-Id: Id4cccf5e06dd39c37bd4fa23965edd31633b0fef Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2824429Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: John Plate <jplate@google.com>
parent ea6dd8b3
Showing with 8 additions and 0 deletions
src/common/platform.h
...@@ -82,8 +82,16 @@ ...@@ -82,8 +82,16 @@
# endif # endif
# endif # endif
// Macros 'near', 'far', 'NEAR' and 'FAR' are defined by 'shared/minwindef.h' in the Windows SDK.
// Macros 'near' and 'far' are empty. They are not used by other Windows headers and are undefined
// here to avoid identifier conflicts. Macros 'NEAR' and 'FAR' contain 'near' and 'far'. They are
// used by other Windows headers and are cleared here to avoid compilation errors.
# undef near # undef near
# undef far # undef far
# undef NEAR
# undef FAR
# define NEAR
# define FAR
#endif #endif
#if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment