diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-04 15:56:47 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-04 15:56:47 -0400 |
| commit | 6c9dbd41941cd65169707cdacc93b9df3993f00a (patch) | |
| tree | 371d23159b9be9caf8980f0a81f6cccf3ec4ed14 | |
| parent | 23092f793efb108448289a7539ae5fee3299a5ef (diff) | |
build: only ever include "config.h" in source (.cc) files.
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_logger.cc | 6 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_logger.h | 12 | ||||
| -rw-r--r-- | gr-blocks/lib/probe_rate_impl.h | 4 |
3 files changed, 3 insertions, 19 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_logger.cc b/gnuradio-core/src/lib/runtime/gr_logger.cc index 530c66f964..1ffb04f789 100644 --- a/gnuradio-core/src/lib/runtime/gr_logger.cc +++ b/gnuradio-core/src/lib/runtime/gr_logger.cc @@ -26,9 +26,9 @@ * The gr_log module wraps the log4cpp library for logging in gnuradio. *******************************************************************************/ -//#ifdef HAVE_CONFIG_H -//#include "config.h" -//#endif +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include <gr_logger.h> #include <stdexcept> diff --git a/gnuradio-core/src/lib/runtime/gr_logger.h b/gnuradio-core/src/lib/runtime/gr_logger.h index 2931a29172..97804ca756 100644 --- a/gnuradio-core/src/lib/runtime/gr_logger.h +++ b/gnuradio-core/src/lib/runtime/gr_logger.h @@ -36,23 +36,11 @@ * */ -#ifndef ENABLE_GR_LOG -#include "config.h" -//#define GR_LOG_CONFIG_H -#endif - #include <gr_core_api.h> #include <assert.h> #include <iostream> #include <boost/format.hpp> -//#ifndef ENABLE_GR_LOG -//#define ENABLE_GR_LOG 1 -//#endif -//#ifndef HAVE_LOG4CPP -//#define HAVE_LOG4CPP 2 -//#endif - #ifdef ENABLE_GR_LOG // We have three configurations... first logging to stdout/stderr diff --git a/gr-blocks/lib/probe_rate_impl.h b/gr-blocks/lib/probe_rate_impl.h index 81f7b4e138..139fc34876 100644 --- a/gr-blocks/lib/probe_rate_impl.h +++ b/gr-blocks/lib/probe_rate_impl.h @@ -23,10 +23,6 @@ #ifndef INCLUDED_GR_PROBE_RATE_IMPL_H #define INCLUDED_GR_PROBE_RATE_IMPL_H -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <blocks/probe_rate.h> namespace gr { |