Fix misc warnings

Fixes https://github.com/behdad/harfbuzz/pull/51
Move macros around

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=84491
Move code around
Merge branch 'master' of git://github.com/behdad/harfbuzz