diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-02-26 10:04:22 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-02-26 11:18:16 -0500 |
| commit | 190faaac44edff4fc3d56c2ede6ec75774cf0d23 (patch) | |
| tree | 0d4a0f1ac8813a4d26a2da2856c89e705c53b1ce /gnuradio-runtime/lib/block.cc | |
| parent | f2b71d302cd30ff272ad7aec78388bdd44e8163c (diff) | |
build: moving the location of the config.h file in the build tree so we can access it in sources as gnuradio/config.h.
Also uses the config.h to pull out if we've defined GR_PERFORMANCE_COUNTERS to handle the setup_pc_rpc function if perf counters are/are not compiled in.
Diffstat (limited to 'gnuradio-runtime/lib/block.cc')
| -rw-r--r-- | gnuradio-runtime/lib/block.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc index 169a1b0d1..7a1364def 100644 --- a/gnuradio-runtime/lib/block.cc +++ b/gnuradio-runtime/lib/block.cc @@ -29,6 +29,7 @@ #include <gnuradio/block_detail.h> #include <gnuradio/buffer.h> #include <gnuradio/prefs.h> +#include <gnuradio/config.h> #include <stdexcept> #include <iostream> @@ -736,7 +737,7 @@ namespace gr { block::setup_pc_rpc() { d_pc_rpc_set = true; -#ifdef GR_CTRLPORT +#if defined(GR_CTRLPORT) && defined(GR_PERFORMANCE_COUNTERS) d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_get<block, float>( alias(), "noutput_items", &block::pc_noutput_items, @@ -848,7 +849,7 @@ namespace gr { pmt::make_c32vector(0,0), pmt::make_c32vector(0,1), pmt::make_c32vector(0,0), "", "Var. of how full output buffers are", RPC_PRIVLVL_MIN, DISPTIME | DISPOPTSTRIP))); -#endif /* GR_CTRLPORT */ +#endif /* defined(GR_CTRLPORT) && defined(GR_PERFORMANCE_COUNTERS) */ } std::ostream& |