Nirbheek Chauhan authored Mar 28, 2016 and Mathieu Duponchelle committed Mar 18, 2018

Also fixes some inconsistency between usage of #ifdef and #if inside C macros
Include support for universal builds and multilib builds via suffixed
arch-specific headers in ${prefix}/include + various other fixes.