fix conditional macros #3638
Merge branch 'V8_2-branch'