Merge branch '1.3-rel'

Change-Id: Ib501451be069310d21bae65b1b3d1993a5b3cc1f
Signed-off-by: Kevin Kane <kkane@microsoft.com>

diff --cc resource/c_common/platform_features.h
index 221a2e8,215bfbf..303ba97
--- 1/resource/c_common/platform_features.h
--- 2/resource/c_common/platform_features.h
+++ b/resource/c_common/platform_features.h
@@@ -102,20 -109,8 +102,20 @@@
  #endif
  
  /**
-  * Mark a parameter as unused. Used to prevent unused variable compiler warnings.
-  */
- #  define OC_UNUSED(x) (void)(x)
- 
- /**
 + * Calling convention.
 + */
 +#ifdef _WIN32
 +/*
 + * Set to __stdcall for Windows, consistent with WIN32 APIs.
 + */
 +#  define OC_CALL   __stdcall
 +#else
 +#  define OC_CALL
 +#endif
 +
++/**
+  * Mark a parameter as unused. Used to prevent unused variable compiler warnings.
+  */
+ #define OC_UNUSED(x) (void)(x)
+ 
  #endif