Merge branch 'fix-arm-2' of https://git01.codeplex.com/forks/locutusofborg/casablanca2 into arm_pull_requests

Author: stgates

Release/include/cpprest/details/cpprest_compat.h

@@ -55,17 +55,11 @@
 // No SAL on non Windows platforms
 #include "cpprest/details/nosal.h"
 
-#if defined(__APPLE__) // Settings specific to Apple
-#define __cdecl
+#if not defined __cdecl
+#if defined cdecl
+#define __cdecl __attribute__ ((cdecl))
 #else
-
-// Settings specific to Linux and Android
-
-// Ignore cdecl on ANDROID ARM and 64bit
-#if defined(__ANDROID__) && defined(__arm__) || defined(__LP64__)
 #define __cdecl
-#else
-#define __cdecl __attribute__ ((cdecl))
 #endif
 
 #if defined(__ANDROID__)

Release/include/pplx/pplxcancellation_token.h

@@ -35,7 +35,7 @@
 #endif
 
 #include <string>
-#include <pplx/pplxinterface.h>
+#include "pplx/pplxinterface.h"
 
 #pragma pack(push,_CRT_PACKING)
 // All header files are required to be protected from the macro new

Release/include/pplx/pplxinterface.h

@@ -46,12 +46,7 @@
 #include <atomic>
 #endif
 
-#if (defined(ANDROID) || defined(__ANDROID__))
-// This prevents users from requiring -Wno-attributes when using gcc-4.8 with the android NDK.
-#define _pplx_cdecl
-#else
 #define _pplx_cdecl __cdecl
-#endif
 
 namespace pplx
 {