just removed redefined 'unlikely' macro
moved likely and unlikely macros to their own header files
updating definitions of macros likely and unlikely
Merge pull request #1018 from stan-dev/feature/issue-1002-unlikely-macro-redefined

Remove warning for 'unlikely' macro redefinition