Update macro definition to reflect current APIs

Resolve #40