For future portability reasons MIT is moving all macros to function calls. This patch allows compilation either way. Submitted by: Jeffrey Altman <jaltman@columbia.edu>