SDL2 update and fixes

An API update, a fix in a macro, and some whitespace trimmings.

Did the API update with [these](https://gist.github.com/CyberShadow/5116907). Not sure how it's supposed to be done or if there's an easier way.