Fix up some cases of GTM not compiling with -Wundef on.

DELTA=23  (16 added, 0 deleted, 7 changed)

git-svn-id: http://google-toolbox-for-mac.googlecode.com/svn/trunk@660 7dc7ac4e-7543-0410-b95c-c1676fc8e2a3