settings: Correct a problem where sometimes CC_INLINE is not defined properly.
Merge pull request #292 from darconeous/pull-requests/settings-cc-inline-fix

settings: Correct a problem where sometimes CC_INLINE is not defined properly
Merge remote-tracking branch 'upstream/master'