Android - Fix duplicate definitions of INT_MIN and PAGE_SIZE in unit tests (dotnet...

* Don't refdefine PAGE_SIZE on Android

* Don't re-declare INT_MIN on Android

* Fixup

Commit migrated from https://github.com/dotnet/coreclr/commit/ec23bace223bf449a08bde2f1ec3e2c0135ce408

diff --git a/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/test1/nopal.cpp b/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/test1/nopal.cpp
index 46a5d87..ae3ebc3 100644 (file)
--- a/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/test1/nopal.cpp
+++ b/src/coreclr/src/pal/tests/palsuite/threading/NamedMutex/test1/nopal.cpp
@@ -16,6 +16,7 @@
 
 #define _countof(a) (sizeof(a) / sizeof(a[0]))
 
+#undef PAGE_SIZE
 #define PAGE_SIZE (4096)
 
 auto test_strcpy = strcpy;

diff --git a/src/coreclr/tests/src/Interop/common/types.h b/src/coreclr/tests/src/Interop/common/types.h
index cb59c42..f183a07 100755 (executable)
--- a/src/coreclr/tests/src/Interop/common/types.h
+++ b/src/coreclr/tests/src/Interop/common/types.h
@@ -5,6 +5,7 @@
 #ifndef _INTEROP_TYPES__H
 #define _INTEROP_TYPES__H
 
+#undef INT_MIN
 #define INT_MIN           (-2147483647 - 1)
 
 typedef char16_t WCHAR;