diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-01-31 08:13:54 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-01-31 08:13:54 +0100 |
| commit | a270d5efcaa019f02e169497cf069f8d462ab398 (patch) | |
| tree | 371ca812c67a129b20d6aca39f06b338218f846c | |
| parent | 72420013928a2d00855ed8ae9c42ac6e229a0b87 (diff) | |
| download | dabmux-a270d5efcaa019f02e169497cf069f8d462ab398.tar.gz dabmux-a270d5efcaa019f02e169497cf069f8d462ab398.tar.bz2 dabmux-a270d5efcaa019f02e169497cf069f8d462ab398.zip | |
fix zmq.h include error when ZMQ disabled
| -rw-r--r-- | src/dabInputZmq.cpp | 8 | ||||
| -rw-r--r-- | src/dabInputZmq.h | 5 | ||||
| -rw-r--r-- | src/dabOutput/dabOutputZMQ.cpp | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/dabInputZmq.cpp b/src/dabInputZmq.cpp index b560313..580e82d 100644 --- a/src/dabInputZmq.cpp +++ b/src/dabInputZmq.cpp @@ -37,6 +37,12 @@ #include "dabInputFifo.h" #include "StatsServer.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef HAVE_INPUT_ZEROMQ + #include <stdio.h> #include <zmq.h> #include <list> @@ -48,8 +54,6 @@ # define bzero(s, n) memset(s, 0, n) #endif -#ifdef HAVE_INPUT_ZEROMQ - extern StatsServer global_stats; struct dabInputOperations dabInputZmqOperations = { diff --git a/src/dabInputZmq.h b/src/dabInputZmq.h index 56708f9..fdca9e6 100644 --- a/src/dabInputZmq.h +++ b/src/dabInputZmq.h @@ -37,11 +37,12 @@ #ifndef DAB_INPUT_ZMQ_H #define DAB_INPUT_ZMQ_H -#ifdef HAVE_INPUT_ZEROMQ - #ifdef HAVE_CONFIG_H # include "config.h" #endif + +#ifdef HAVE_INPUT_ZEROMQ + #include <zmq.h> #include <list> #include <string> diff --git a/src/dabOutput/dabOutputZMQ.cpp b/src/dabOutput/dabOutputZMQ.cpp index 271cfa1..24fa6dc 100644 --- a/src/dabOutput/dabOutputZMQ.cpp +++ b/src/dabOutput/dabOutputZMQ.cpp @@ -32,7 +32,9 @@ You should have received a copy of the GNU General Public License along with CRC-DabMux. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #if defined(HAVE_OUTPUT_ZEROMQ) |