Change in osmo-remsim[master]: move DMAIN definition to new debug.h

[Harald Welte]

Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/11346


Change subject: move DMAIN definition to new debug.h
......................................................................

move DMAIN definition to new debug.h

This way both client.h and bankd.h don't conflict with each other

Change-Id: I68ffd64e1f32b90206f98c7f3ea707d7b2e11e61
---
M src/Makefile.am
M src/bankd.h
M src/client.h
A src/debug.h
4 files changed, 8 insertions(+), 9 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/46/11346/1

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 @@
 			  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 <osmocom/core/linuxlist.h>
 
 #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 <osmocom/abis/ipa.h>
 
 #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,
+};

-- 
To view, visit https://gerrit.osmocom.org/11346
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I68ffd64e1f32b90206f98c7f3ea707d7b2e11e61
Gerrit-Change-Number: 11346
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181014/d4c1fbc7/attachment.htm>