From a4e0a2396bfb3ecf09b3394f10d5a1b37fd66b3e Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 14 Oct 2018 17:44:25 +0200 Subject: [PATCH] move DMAIN definition to new debug.h This way both client.h and bankd.h don't conflict with each other Change-Id: I68ffd64e1f32b90206f98c7f3ea707d7b2e11e61 --- src/Makefile.am | 2 +- src/bankd.h | 5 +---- src/client.h | 5 +---- src/debug.h | 5 +++++ 4 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 src/debug.h diff --git a/src/Makefile.am b/src/Makefile.am index 12b1e7b..ca799ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ libosmo_rspro_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ rspro/libosmo-asn1-rspro.la libosmo_rspro_la_SOURCES = rspro_util.c -noinst_HEADERS = bankd.h client.h internal.h rspro_util.h \ +noinst_HEADERS = debug.h bankd.h client.h internal.h rspro_util.h \ simtrace2/apdu_dispatch.h \ simtrace2/libusb_util.h \ simtrace2/simtrace2-discovery.h \ diff --git a/src/bankd.h b/src/bankd.h index 86a66b9..86b75cc 100644 --- a/src/bankd.h +++ b/src/bankd.h @@ -13,10 +13,7 @@ #include #include "rspro_util.h" - -enum { - DMAIN, -}; +#include "debug.h" struct bankd; diff --git a/src/client.h b/src/client.h index b772a20..df90404 100644 --- a/src/client.h +++ b/src/client.h @@ -4,10 +4,7 @@ #include #include "rspro_util.h" - -enum { - DMAIN, -}; +#include "debug.h" /* fsm.c */ diff --git a/src/debug.h b/src/debug.h new file mode 100644 index 0000000..187d895 --- /dev/null +++ b/src/debug.h @@ -0,0 +1,5 @@ +#pragma once + +enum { + DMAIN, +};