Address macro redefinition warnings in OS X

Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com>