fix conditional macros #3638