Revert "fixed confliction and compiler errors."

This reverts commit afff490a44bc681882f7b8c40fc2e65c1b186ac3.

Conflicts:
	common/patches/mac_constants.h