Merge branch 'master' of git://github.com/awakecoding/FreeRDP

diff --cc winpr/include/winpr/string.h
index d35728b,9321b48..6da3fcd
--- 1/winpr/include/winpr/string.h
--- 2/winpr/include/winpr/string.h
+++ b/winpr/include/winpr/string.h
@@@ -153,8 -153,9 +153,10 @@@ WINPR_API int lstrcmpW(LPCWSTR lpString
  #endif
  
  #define        sprintf_s      snprintf
 +#define _scprintf(_fmt, ...) snprintf(NULL, 0, _fmt, ## __VA_ARGS__)
  
+ #define _scprintf(_fmt, ...)  snprintf(NULL, 0, _fmt, ## __VA_ARGS__)
+ 
  /* Unicode Conversion */
  
  WINPR_API int MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCSTR lpMultiByteStr,