ref: 0c438ecdd39e645a0f6315c6bea413fc214e6fd6
parent: 306a1daa14146aa8e7002bf067292939d030f517
parent: d7c907198b9b834bbb93eb48d23ddf3e96540e61
author: Ethan Hugg <[email protected]>
date: Fri Jan 17 03:45:44 EST 2014
Merge pull request #158 from mstorsjo/fix-msvc-2012-build Fix building in MSVC 2012 by avoiding redefining the inline keyword
--- a/codec/common/macros.h
+++ b/codec/common/macros.h
@@ -104,7 +104,9 @@
#endif//#if _MACH_PLATFORM
#if defined(_MSC_VER)
+#if _MSC_VER < 1700
#define inline __inline
+#endif
#define __FASTCALL __fastcall
// #define __align8(t,v) __declspec(align(8)) t v
#define __align16(t,v) __declspec(align(16)) t v