diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-01-17 16:28:07 -0800 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-01-17 16:28:07 -0800 |
| commit | 2683a0c0f240c2e42af2fae7cb91643b3f455111 (patch) | |
| tree | 901bbf42fb747862a7e27dc28583dc0d41f431fc /gruel | |
| parent | 61b4f5e1a1141cee6c5ccb16d648f1d195f73c77 (diff) | |
| parent | b6a00c8ba86d5356d574d0c4166ed9c0255a9a90 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gruel')
| -rw-r--r-- | gruel/src/include/gruel/high_res_timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gruel/src/include/gruel/high_res_timer.h b/gruel/src/include/gruel/high_res_timer.h index 9be5246246..63841f6128 100644 --- a/gruel/src/include/gruel/high_res_timer.h +++ b/gruel/src/include/gruel/high_res_timer.h @@ -46,7 +46,7 @@ namespace gruel { #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) #define GRUEL_HRT_USE_MACH_ABSOLUTE_TIME #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - #define GRUEL_HRT_USE_MACH_ABSOLUTE_TIME + #define GRUEL_HRT_USE_CLOCK_GETTIME #else #define GRUEL_HRT_USE_MICROSEC_CLOCK #endif |