issue #4401. resolve conflicts
Merge pull request #5985 from andyque/remove_pragma_mark

issue #4401, remove unused pargma mark macro