Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85b997fd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Undefine 'near' and 'far' in mat4.h for host Windows" into main am: 6b960372 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2990049



Change-Id: Id45b8de2ace80060be39a8e076e0be8dd7e844c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 760f097b 6b960372

libs/math/include/math/mat4.h

+8 −0
Original line number Diff line number Diff line
@@ -34,6 +34,14 @@ 
#define CONSTEXPR

#endif



#ifdef _WIN32

// windows.h contains obsolete defines of 'near' and 'far' for systems using

// legacy 16 bit pointers. Undefine them to avoid conflicting with the usage of

// 'near' and 'far' in this file.

#undef near

#undef far

#endif



namespace android {

// -------------------------------------------------------------------------------------

namespace details {