@danb, when introducing the inline functions as macro replacements you
misdeclared some parameter types.  I've fixed it now :)

Signed-off-by: Rahix <rahix@rahix.de>