Commit f009347e3990b907d988110f926e863d85b9dc86

Con Kolivas 2013-08-25T15:02:01

Move two more timer functions out of define macros to enable them to be used by future osx code.