More compilation fixes.  FIxing for windows broke linux...
More compilation fixes.  FIxing for windows broke linux...

SVN revision: 52038

tasn/elementary,rvandegrift/elementary,FlorentRevest/Elementary,tasn/elementary,rvandegrift/elementary,FlorentRevest/Elementary,tasn/elementary,FlorentRevest/Elementary,tasn/elementary,rvandegrift/elementary,rvandegrift/elementary,tasn/elementary,FlorentRevest/Elementary