diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gnuradio-runtime/include/gr_realtime.h | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gnuradio-runtime/include/gr_realtime.h')
| -rw-r--r-- | gnuradio-runtime/include/gr_realtime.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-runtime/include/gr_realtime.h b/gnuradio-runtime/include/gr_realtime.h index fcdb5222cc..a1e5af69c4 100644 --- a/gnuradio-runtime/include/gr_realtime.h +++ b/gnuradio-runtime/include/gr_realtime.h @@ -24,9 +24,9 @@ #define INCLUDED_GR_REALTIME_H #include <gr_runtime_api.h> -#include <gruel/realtime.h> +#include <realtime.h> -typedef gruel::rt_status_t gr_rt_status_t; +typedef gr::rt_status_t gr_rt_status_t; /*! * \brief If possible, enable high-priority "real time" scheduling. |