make macros compile for 2.10.4