Fixed EOLs to UNIX format.

The earlier EOL was DOS/Windows; this happened because the commit was
from a Windows machine. However, the preferred EOL is the UNIX format.
Indented multiline macros.

This was done to improve readability while preserving the columnar
format for the definitions.
Merge branch 'feature-ifaces' into develop