<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13138">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rename bscconfig.h to config.h, cleanup<br><br>Get rid of the legacy name bscconfig.h from osmo-nitb times.<br><br>Remove the #include from some of the files that aren't actually using it.<br><br>Instead of '#include "../../config.h"', use plain '#include "config.h"'<br>because we're anyway passing $top_srcdir as -I during compilation.<br><br>Change-Id: Id4f683be1f36f0630c83da54e02868aae847aeec<br>---<br>M .gitignore<br>M configure.ac<br>M src/libmsc/gsm_04_08.c<br>M src/libmsc/gsm_04_08_cc.c<br>M src/libmsc/gsm_04_11.c<br>M src/libmsc/gsm_04_14.c<br>M src/libmsc/msc_net_init.c<br>M src/libmsc/msc_vty.c<br>M src/libmsc/ran_infra.c<br>M src/osmo-msc/msc_main.c<br>10 files changed, 9 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index 78974d7..bcd6847 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -5,8 +5,8 @@</span><br><span> .deps</span><br><span> Makefile</span><br><span> Makefile.in</span><br><span style="color: hsl(0, 100%, 40%);">-bscconfig.h</span><br><span style="color: hsl(0, 100%, 40%);">-bscconfig.h.in</span><br><span style="color: hsl(120, 100%, 40%);">+config.h</span><br><span style="color: hsl(120, 100%, 40%);">+config.h.in</span><br><span> *.pc</span><br><span> </span><br><span> *.*~</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index ae6dd6a..36ff99e 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -237,7 +237,7 @@</span><br><span> AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])</span><br><span> </span><br><span> dnl Generate the output</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CONFIG_HEADER(bscconfig.h)</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CONFIG_HEADER(config.h)</span><br><span> </span><br><span> AC_OUTPUT(</span><br><span>     include/Makefile</span><br><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index 667a1c6..79488cd 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -32,7 +32,7 @@</span><br><span> #include <regex.h></span><br><span> #include <sys/types.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "bscconfig.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "config.h"</span><br><span> </span><br><span> #include <osmocom/msc/db.h></span><br><span> #include <osmocom/msc/debug.h></span><br><span>diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c</span><br><span>index aa97649..0624d56 100644</span><br><span>--- a/src/libmsc/gsm_04_08_cc.c</span><br><span>+++ b/src/libmsc/gsm_04_08_cc.c</span><br><span>@@ -30,8 +30,6 @@</span><br><span> #include <regex.h></span><br><span> #include <sys/types.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "bscconfig.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include <osmocom/msc/db.h></span><br><span> #include <osmocom/msc/debug.h></span><br><span> #include <osmocom/msc/gsm_data.h></span><br><span>diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c</span><br><span>index 60cdaee..ff5576f 100644</span><br><span>--- a/src/libmsc/gsm_04_11.c</span><br><span>+++ b/src/libmsc/gsm_04_11.c</span><br><span>@@ -33,7 +33,7 @@</span><br><span> #include <time.h></span><br><span> #include <netinet/in.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "bscconfig.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "config.h"</span><br><span> </span><br><span> #include <osmocom/core/msgb.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span>diff --git a/src/libmsc/gsm_04_14.c b/src/libmsc/gsm_04_14.c</span><br><span>index 044b61c..8116558 100644</span><br><span>--- a/src/libmsc/gsm_04_14.c</span><br><span>+++ b/src/libmsc/gsm_04_14.c</span><br><span>@@ -24,8 +24,6 @@</span><br><span> #include <string.h></span><br><span> #include <sys/types.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "bscconfig.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include <osmocom/msc/debug.h></span><br><span> #include <osmocom/msc/gsm_data.h></span><br><span> #include <osmocom/msc/gsm_subscriber.h></span><br><span>diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c</span><br><span>index 51e8595..637ee74 100644</span><br><span>--- a/src/libmsc/msc_net_init.c</span><br><span>+++ b/src/libmsc/msc_net_init.c</span><br><span>@@ -21,7 +21,7 @@</span><br><span>  *</span><br><span>  */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "bscconfig.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "config.h"</span><br><span> </span><br><span> #include <osmocom/core/tdef.h></span><br><span> </span><br><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index bb36392..a3237cd 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -23,7 +23,7 @@</span><br><span> /* NOTE: I would have liked to call this the MSC_NODE instead of the MSC_NODE,</span><br><span>  * but MSC_NODE already exists to configure a remote MSC for osmo-bsc. */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "../../bscconfig.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "config.h"</span><br><span> </span><br><span> #include <inttypes.h></span><br><span> #include <limits.h></span><br><span>diff --git a/src/libmsc/ran_infra.c b/src/libmsc/ran_infra.c</span><br><span>index a3a7457..af40541 100644</span><br><span>--- a/src/libmsc/ran_infra.c</span><br><span>+++ b/src/libmsc/ran_infra.c</span><br><span>@@ -31,7 +31,7 @@</span><br><span> </span><br><span> #include <osmocom/msc/ran_infra.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "bscconfig.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "config.h"</span><br><span> </span><br><span> const struct value_string an_proto_names[] = {</span><br><span>        { OSMO_GSUP_ACCESS_NETWORK_PROTOCOL_TS3G_48006, "Ts3G-48006" },</span><br><span>diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c</span><br><span>index 857a6a6..e101d89 100644</span><br><span>--- a/src/osmo-msc/msc_main.c</span><br><span>+++ b/src/osmo-msc/msc_main.c</span><br><span>@@ -36,7 +36,7 @@</span><br><span> #include <getopt.h></span><br><span> </span><br><span> /* build switches from the configure script */</span><br><span style="color: hsl(0, 100%, 40%);">-#include "../../bscconfig.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "config.h"</span><br><span> </span><br><span> #include <osmocom/msc/db.h></span><br><span> #include <osmocom/core/application.h></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13138">change 13138</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/13138"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id4f683be1f36f0630c83da54e02868aae847aeec </div>
<div style="display:none"> Gerrit-Change-Number: 13138 </div>
<div style="display:none"> Gerrit-PatchSet: 16 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Max <suraev@alumni.ntnu.no> </div>