Merge pull request #1833 from kouvel/Inline2

Move some functions to allow them to be inlined with clang

42 files changed, 34 insertions, 34 deletions

diff --git a/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt
index fdf177cfd2..bafaa23732 100644
--- a/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_rotl_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_rotl/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_rotl/test1/test1.cpp
index 3399a74034..3399a74034 100644
--- a/src/pal/tests/palsuite/c_runtime/_rotl/test1/test1.c
+++ b/src/pal/tests/palsuite/c_runtime/_rotl/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt
index 563d66b808..c0c76feb36 100644
--- a/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_rotr_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_rotr/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_rotr/test1/test1.cpp
index 2d65edba29..2d65edba29 100644
--- a/src/pal/tests/palsuite/c_runtime/_rotr/test1/test1.c
+++ b/src/pal/tests/palsuite/c_runtime/_rotr/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/CMakeLists.txt
index 6a946236c3..e5ba709c11 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockedexchangeadd_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.c b/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.cpp
index d0e1eaed31..d0e1eaed31 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/CMakeLists.txt
index 3dc8f29131..a70802ea2d 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockedbit_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/test.cpp
index d7cb0e0d9e..5e09e0e79a 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/test.cpp
@@ -24,12 +24,12 @@ typedef struct tag_TEST_DATA
 
 TEST_DATA test_data[] =
 {
-    { 0x00000000,  3, 0x00000000, 0 },
-    { 0x12341234,  2, 0x12341230, 1 },
-    { 0x12341234,  3, 0x12341234, 0 },
-    { 0x12341234, 31, 0x12341234, 0 },
-    { 0x12341234, 28, 0x02341234, 1 },
-    { 0xffffffff, 28, 0xefffffff, 1 }
+    { (LONG)0x00000000,  3, (LONG)0x00000000, 0 },
+    { (LONG)0x12341234,  2, (LONG)0x12341230, 1 },
+    { (LONG)0x12341234,  3, (LONG)0x12341234, 0 },
+    { (LONG)0x12341234, 31, (LONG)0x12341234, 0 },
+    { (LONG)0x12341234, 28, (LONG)0x02341234, 1 },
+    { (LONG)0xffffffff, 28, (LONG)0xefffffff, 1 }
 };
 
 int __cdecl main(int argc, char *argv[]) {
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/CMakeLists.txt
index 64d6581e4b..6b50a755fe 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockedbit_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/test.cpp
index 51fb25c4d7..fa4fc6ef2c 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/test.cpp
@@ -24,12 +24,12 @@ typedef struct tag_TEST_DATA
 
 TEST_DATA test_data[] =
 {
-    { 0x00000000,  2, 0x00000004, 0 },
-    { 0x12341234,  2, 0x12341234, 1 },
-    { 0x12341234,  3, 0x1234123c, 0 },
-    { 0x12341234, 31, 0x92341234, 0 },
-    { 0x12341234, 28, 0x12341234, 1 },
-    { 0xffffffff, 28, 0xffffffff, 1 }
+    { (LONG)0x00000000,  2, (LONG)0x00000004, 0 },
+    { (LONG)0x12341234,  2, (LONG)0x12341234, 1 },
+    { (LONG)0x12341234,  3, (LONG)0x1234123c, 0 },
+    { (LONG)0x12341234, 31, (LONG)0x92341234, 0 },
+    { (LONG)0x12341234, 28, (LONG)0x12341234, 1 },
+    { (LONG)0xffffffff, 28, (LONG)0xffffffff, 1 }
 };
 
 int __cdecl main(int argc, char *argv[]) {
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/CMakeLists.txt
index a3f4f741d7..d9e867256a 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockedcompareexchange_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/test.cpp
index c2a1ed284a..c2a1ed284a 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/CMakeLists.txt
index fdf0521b50..038d375273 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockedcompareexchange_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/test.cpp
index 33259f582e..33259f582e 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/CMakeLists.txt
index 6000db2286..722603eb4a 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockedcompareexchange64_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.cpp
index 2fa6e3232f..2fa6e3232f 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/CMakeLists.txt
index 2a82236f0f..f052ca0b27 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockedcompareexchange64_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.cpp
index 272795cba6..272795cba6 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/CMakeLists.txt
index a9fc74bb24..0c48c4e296 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockedcompareexchangepointer_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/test.cpp
index b720479a2e..3a5e5f7171 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchangePointer/test1/test.cpp
@@ -52,7 +52,7 @@ int __cdecl main(int argc, char *argv[])
        (5 in this case) 
     */
   
-    if((int)ReturnValue != 5) 
+    if((int)(size_t)ReturnValue != 5) 
     {
         Fail("ERROR: The return value should be the value of the "
              "variable before the exchange took place, which was 5.  "
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/CMakeLists.txt
index 8b6fbfd79f..6cd307d2e8 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockeddecrement_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/test.cpp
index 6fe3982334..6fe3982334 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/CMakeLists.txt
index 320019ed77..331d89d5d6 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockeddecrement_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/test.cpp
index 04182697fe..04182697fe 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/CMakeLists.txt
index c942a333b1..727a328d07 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockeddecrement64_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/test.cpp
index 9e1744c71b..9e1744c71b 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/CMakeLists.txt
index d5462ca7dd..ecea6399a7 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockeddecrement64_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/test.cpp
index 84c24bc884..84c24bc884 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/CMakeLists.txt
index 39911d2de2..a1a7f862ed 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockedexchange_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/test.cpp
index dd23a223d5..dd23a223d5 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedExchange/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/CMakeLists.txt
index 832868e7b7..3f4cd5e058 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockedexchange64_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/test.cpp
index 08e7405ab2..08e7405ab2 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/CMakeLists.txt
index e43533d1c1..b0858963a0 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  InterlockedExchangePointer.c
+  InterlockedExchangePointer.cpp
 )
 
 add_executable(paltest_interlockedexchangepointer_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/InterlockedExchangePointer.c b/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/InterlockedExchangePointer.cpp
index 9fb32f4fb3..9fb32f4fb3 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/InterlockedExchangePointer.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedExchangePointer/test1/InterlockedExchangePointer.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/CMakeLists.txt
index 258d4bcb9b..f87dc72281 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockedincrement_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/test.cpp
index 04ca9f3bb5..04ca9f3bb5 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/CMakeLists.txt
index 124f95a0a9..e8c5278cbc 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockedincrement_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/test.cpp
index ecc2c0d8ff..ecc2c0d8ff 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/CMakeLists.txt
index 2520ac583a..d7bec46d4e 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockedincrement64_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/test.cpp
index c3b427706a..c3b427706a 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/CMakeLists.txt
index 4d85e40dfb..be571a535b 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_interlockedincrement64_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/test.c b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/test.cpp
index 4a85b7fd3f..4a85b7fd3f 100644
--- a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/test.cpp