<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11346">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move DMAIN definition to new debug.h<br><br>This way both client.h and bankd.h don't conflict with each other<br><br>Change-Id: I68ffd64e1f32b90206f98c7f3ea707d7b2e11e61<br>---<br>M src/Makefile.am<br>M src/bankd.h<br>M src/client.h<br>A src/debug.h<br>4 files changed, 8 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/46/11346/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index 12b1e7b..ca799ce 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -12,7 +12,7 @@</span><br><span>                       rspro/libosmo-asn1-rspro.la</span><br><span> libosmo_rspro_la_SOURCES = rspro_util.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-noinst_HEADERS = bankd.h client.h internal.h rspro_util.h \</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_HEADERS = debug.h bankd.h client.h internal.h rspro_util.h \</span><br><span>                  simtrace2/apdu_dispatch.h \</span><br><span>                  simtrace2/libusb_util.h \</span><br><span>            simtrace2/simtrace2-discovery.h \</span><br><span>diff --git a/src/bankd.h b/src/bankd.h</span><br><span>index 86a66b9..86b75cc 100644</span><br><span>--- a/src/bankd.h</span><br><span>+++ b/src/bankd.h</span><br><span>@@ -13,10 +13,7 @@</span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> </span><br><span> #include "rspro_util.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-enum {</span><br><span style="color: hsl(0, 100%, 40%);">-    DMAIN,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(120, 100%, 40%);">+#include "debug.h"</span><br><span> </span><br><span> struct bankd;</span><br><span> </span><br><span>diff --git a/src/client.h b/src/client.h</span><br><span>index b772a20..df90404 100644</span><br><span>--- a/src/client.h</span><br><span>+++ b/src/client.h</span><br><span>@@ -4,10 +4,7 @@</span><br><span> #include <osmocom/abis/ipa.h></span><br><span> </span><br><span> #include "rspro_util.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-enum {</span><br><span style="color: hsl(0, 100%, 40%);">-   DMAIN,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(120, 100%, 40%);">+#include "debug.h"</span><br><span> </span><br><span> /* fsm.c */</span><br><span> </span><br><span>diff --git a/src/debug.h b/src/debug.h</span><br><span>new file mode 100644</span><br><span>index 0000000..187d895</span><br><span>--- /dev/null</span><br><span>+++ b/src/debug.h</span><br><span>@@ -0,0 +1,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enum {</span><br><span style="color: hsl(120, 100%, 40%);">+  DMAIN,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11346">change 11346</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11346"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I68ffd64e1f32b90206f98c7f3ea707d7b2e11e61 </div>
<div style="display:none"> Gerrit-Change-Number: 11346 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>