some macro.hpp cleanup, gcc warning

git-svn-id: http://farmanager.googlecode.com/svn/trunk@11819 ea59307d-ff68-5b67-5a21-acd59c66a581
revert 3908.1 for now

git-svn-id: http://farmanager.googlecode.com/svn/trunk@11821 ea59307d-ff68-5b67-5a21-acd59c66a581