Potential fix for 'inline' macro redefinition error - VS2012 C++
Merge pull request #1250 from Archytaus/master

Fix for 'inline' macro redefinition error in VS2012 C++