generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix building in MSVC 2012 by avoiding redefining the inline keyword

Browse Source 
While building succeeds in MSVC 2008, it currently fails in 2012
due to error C1189 "The C++ standard library forbids macroizing
keywords", which is caused by doing "#define inline __inline" in
the macros.h header.

This could have been missed before since it only was triggered
if macros.h was included before some other system header was
included that contained checks against these inline defines.
This commit is contained in:
Martin Storsjö 2014-01-10 14:44:47 +02:00
parent 306a1daa14
commit d7c907198b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec/common/macros.h
View File

@ -104,7 +104,9 @@ __declspec(align(alignment)) type name[(sizex)*(sizey)]
#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