Added define guards for _rotl and related bit rotation functions, which collided with function definitions in x86intrin.h
Merge pull request #1906 from mrd-cloudbase/master

Added define guards for _rotl and related bit rotation functions