diff options
| author | Johnathan Corgan | 2012-02-14 12:32:52 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-02-14 12:34:47 -0800 |
| commit | f0a1631dad755d5abf28351f07b2bbf7773b37b8 (patch) | |
| tree | 397b02568ddbab1f85646afdd06aee6fd540c99c /gruel | |
| parent | ef1748e4efc40cc065fb5f1b40d710256dd37efa (diff) | |
| parent | dc266ca38bdc59955f8c8d8a98291f078d7f4377 (diff) | |
| download | gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.tar.gz gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.tar.bz2 gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.zip | |
Merge branch 'master' into safe_align
Conflicts:
gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
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 9be524624..63841f612 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 |