Change in osmo-msc[master]: rename bscconfig.h to configure.h, cleanup

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Tue Mar 5 22:33:58 UTC 2019


Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/13138


Change subject: rename bscconfig.h to configure.h, cleanup
......................................................................

rename bscconfig.h to configure.h, cleanup

Get rid of the legacy name bscconfig.h from osmo-nitb times.

Remove the #include from some of the files that aren't actually using it.

Instead of '#include "../../configure.h"', use plain '#include "configure.h"'
because we're anyway passing $top_srcdir as -I during compilation.

Change-Id: Id4f683be1f36f0630c83da54e02868aae847aeec
---
M .gitignore
M configure.ac
M src/libmsc/gsm_04_08.c
M src/libmsc/gsm_04_08_cc.c
M src/libmsc/gsm_04_11.c
M src/libmsc/gsm_04_14.c
M src/libmsc/msc_vty.c
M src/libmsc/ran_infra.c
M src/osmo-msc/msc_main.c
9 files changed, 8 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/13138/1

diff --git a/.gitignore b/.gitignore
index 78974d7..b380b26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,8 @@
 .deps
 Makefile
 Makefile.in
-bscconfig.h
-bscconfig.h.in
+configure.h
+configure.h.in
 *.pc
 
 *.*~
diff --git a/configure.ac b/configure.ac
index 060f61f..a36301e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,7 +254,7 @@
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
 
 dnl Generate the output
-AM_CONFIG_HEADER(bscconfig.h)
+AM_CONFIG_HEADER(configure.h)
 
 AC_OUTPUT(
     include/Makefile
diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index 65f7e1e..1c746cd 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -32,7 +32,7 @@
 #include <regex.h>
 #include <sys/types.h>
 
-#include "bscconfig.h"
+#include "configure.h"
 
 #include <osmocom/msc/db.h>
 #include <osmocom/msc/debug.h>
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index f240842..3ecfacc 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -30,8 +30,6 @@
 #include <regex.h>
 #include <sys/types.h>
 
-#include "bscconfig.h"
-
 #include <osmocom/msc/db.h>
 #include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
index 8b6ba99..2cbbcaa 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -33,7 +33,7 @@
 #include <time.h>
 #include <netinet/in.h>
 
-#include "bscconfig.h"
+#include "configure.h"
 
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/talloc.h>
diff --git a/src/libmsc/gsm_04_14.c b/src/libmsc/gsm_04_14.c
index 044b61c..8116558 100644
--- a/src/libmsc/gsm_04_14.c
+++ b/src/libmsc/gsm_04_14.c
@@ -24,8 +24,6 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "bscconfig.h"
-
 #include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/gsm_subscriber.h>
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index e2211a3..cc422e0 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -23,7 +23,7 @@
 /* NOTE: I would have liked to call this the MSC_NODE instead of the MSC_NODE,
  * but MSC_NODE already exists to configure a remote MSC for osmo-bsc. */
 
-#include "../../bscconfig.h"
+#include "configure.h"
 
 #include <inttypes.h>
 #include <limits.h>
diff --git a/src/libmsc/ran_infra.c b/src/libmsc/ran_infra.c
index 606b855..af12c10 100644
--- a/src/libmsc/ran_infra.c
+++ b/src/libmsc/ran_infra.c
@@ -6,7 +6,7 @@
 #include <osmocom/msc/nas_iu.h>
 #include <osmocom/msc/ran_peer.h>
 
-#include "bscconfig.h"
+#include "configure.h"
 
 const struct value_string an_proto_names[] = {
 	{ TS3G_48_006, "Ts3G-48006" },
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index 40e93c6..d30bb3b 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -36,7 +36,7 @@
 #include <getopt.h>
 
 /* build switches from the configure script */
-#include "../../bscconfig.h"
+#include "configure.h"
 
 #include <osmocom/msc/db.h>
 #include <osmocom/core/application.h>

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

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4f683be1f36f0630c83da54e02868aae847aeec
Gerrit-Change-Number: 13138
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190305/7ac3cd19/attachment-0001.html>


More information about the gerrit-log mailing list