Commit e575763a80f26f2f00e2dcc20480b93a286aac93

Con Kolivas 2012-10-22T22:06:00

Avoid redefining macros and align to 4 byte boundaries.