Updated to unified diff. Added defines for update functions.
Updated patch to unified format.
Added defines for update function.