Move macro definition to separate source file.
Merge branch 'rust-servo'