Index: datatype-restricted/wm/audio/codec/wma10/import/wma10dec/audio/common/include/mmreg_.h
===================================================================
RCS file: /cvsroot/wmcode-audio/codec/wma10/import/wma10dec/audio/common/include/mmreg_.h,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 mmreg_.h
--- datatype-restricted/wm/audio/codec/wma10/import/wma10dec/audio/common/include/mmreg_.h	2 Dec 2008 14:39:39 -0000	1.2.2.1
+++ datatype-restricted/wm/audio/codec/wma10/import/wma10dec/audio/common/include/mmreg_.h	16 Jul 2010 17:00:56 -0000
@@ -18,6 +18,21 @@
 #ifndef __arm
 #ifndef _XBOX
 #if defined( _WIN32 )
+#if !defined( EXTERN_C )
+#ifdef __cplusplus
+    #define EXTERN_C    extern "C"
+#else
+    #define EXTERN_C    extern
+#endif
+#endif
+
+#if !defined(CDECL)
+#ifdef __cplusplus
+#define CDECL __cdecl
+#else
+#define CDECL
+#endif
+#endif
 #include "mmreg.h"
 #include <mmreg.h>
 #endif
Index: datatype-restricted/wm/audio/codec/wma9voice/import/wmspv9_dec/audio/common/include/wmspecstring.h
===================================================================
RCS file: /cvsroot/wmcode-audio/codec/wma9voice/import/wmspv9_dec/audio/common/include/wmspecstring.h,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 wmspecstring.h
--- datatype-restricted/wm/audio/codec/wma9voice/import/wmspv9_dec/audio/common/include/wmspecstring.h	4 Mar 2009 07:19:54 -0000	1.1.2.3
+++ datatype-restricted/wm/audio/codec/wma9voice/import/wmspv9_dec/audio/common/include/wmspecstring.h	16 Jul 2010 17:00:56 -0000
@@ -11,6 +11,13 @@
 #if (!defined UNDER_CE && !defined NO_WINDOWS && !defined SPECSTRINGS_H)
 #define SPECSTRINGS_H
 
+#define __ANNOTATION(fun)
+#define __PRIMOP(type, fun)
+#define __AuToQuOtE
+#define __deferTypecheck
+#define __possibly_notnullterminated
+#define __analysis_noreturn
+
 /*************************************************************************
 * See specstrings_strict.h for documentation of all user visible macros.
 *************************************************************************/