fix macros

git-svn-id: http://farmanager.com/svn/trunk@10171 72235d2c-c60c-0410-a47a-a0032694dc5d
update headers to 3368

git-svn-id: http://farmanager.com/svn/trunk@10173 72235d2c-c60c-0410-a47a-a0032694dc5d