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

2014-02-28 12:22:23 -05:00 · 2014-02-28 12:22:23 -05:00 · e2c1713bcb
parent 8510ad3171 fde6a98580
commit e2c1713bcb
1 changed files with 1 additions and 1 deletions
--- a/winpr/include/winpr/spec.h
+++ b/winpr/include/winpr/spec.h
@ -874,7 +874,7 @@
 #define __nullterminated
 #define __out_awcount(expr,size)
 #define __override
-#define __reserved
+//#define __reserved			/* Conflicts with header included by CarbonCore.h on OS X */
 #define __success(expr)
 #define __typefix(ctype)