diff options
| author | Marcus Müller <marcus.mueller@ettus.com> | 2018-03-30 20:50:04 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus.mueller@ettus.com> | 2018-03-30 20:50:04 +0200 |
| commit | 61c0382eb2935a6da6c81bd93c8b9c8ef2893df2 (patch) | |
| tree | 5e67df4059f5522ccc62cd85f33100ee96bb7988 /gnuradio-runtime/include/gnuradio/sys_pri.h | |
| parent | 9a6bf484394f5954483477856f6a6712331b9ee6 (diff) | |
| parent | 20d463d138782fd56397f5324be6e34af156b239 (diff) | |
Merge branch 'maint' through 'last_merge_to_master'
This is the last time we're merging 'maint' to 'master'. The 'maint'
branch will cease to exist shortly; we'll have a 'maint-3.7' branch.
For further information on the new development model:
http://lists.gnu.org/archive/html/discuss-gnuradio/2018-02/msg00133.html
Diffstat (limited to 'gnuradio-runtime/include/gnuradio/sys_pri.h')
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/sys_pri.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnuradio-runtime/include/gnuradio/sys_pri.h b/gnuradio-runtime/include/gnuradio/sys_pri.h index adceb91b9d..d251455a11 100644 --- a/gnuradio-runtime/include/gnuradio/sys_pri.h +++ b/gnuradio-runtime/include/gnuradio/sys_pri.h @@ -23,7 +23,7 @@ #define INCLUDED_GNURADIO_SYS_PRI_H #include <gnuradio/api.h> -#include <realtime.h> +#include <gnuradio/realtime.h> /* * A single place to define real-time priorities used by the system itself @@ -31,10 +31,10 @@ namespace gr { struct GR_RUNTIME_API sys_pri { - static rt_sched_param python(); // python code - static rt_sched_param normal(); // normal blocks - static rt_sched_param gcell_event_handler(); - static rt_sched_param usrp2_backend(); // thread that services the ethernet + static struct GR_RUNTIME_API rt_sched_param python(); // python code + static struct GR_RUNTIME_API rt_sched_param normal(); // normal blocks + static struct GR_RUNTIME_API rt_sched_param gcell_event_handler(); + static struct GR_RUNTIME_API rt_sched_param usrp2_backend(); // thread that services the ethernet }; } /* namespace gr */ |