daniel submitted this change.

View Change



6 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.

Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified
Use config.h with AC_CONFIG_HEADER for defines

Change-Id: I15c25b04dc7ef62f46e2429042613ff8f7ca9ce9
---
M configure.ac
M src/ipa.c
M src/ss7_as.c
M src/ss7_as.h
M src/ss7_as_vty.c
M src/ss7_asp.c
M src/ss7_asp.h
M src/ss7_asp_vty.c
M src/ss7_vty.c
M src/xua_asp_fsm.c
M stp/stp_main.c
M tests/ss7/ss7_test.c
M tests/vty/ss7_asp_vty_test.c
13 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index c8f3c91..2f9a352 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,9 @@
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.11.0)
PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.6.0)

+dnl Generate the output
+AC_CONFIG_HEADER(config.h)
+
# TCAP loadsharing
AC_ARG_ENABLE([tcap-loadsharing], [AS_HELP_STRING([--enable-tcap-loadsharing], [Build with TCAP loadsharing. Requires libosmo-asn1-tcap [default=no]])],
[osmo_ac_tcap="$enableval"],[osmo_ac_tcap="no"])
diff --git a/src/ipa.c b/src/ipa.c
index 1f4b808..6cf7104 100644
--- a/src/ipa.c
+++ b/src/ipa.c
@@ -20,6 +20,8 @@
*
*/

+#include "config.h"
+
#include <stdint.h>
#include <errno.h>
#include <unistd.h>
diff --git a/src/ss7_as.c b/src/ss7_as.c
index 808047d..f1c9528 100644
--- a/src/ss7_as.c
+++ b/src/ss7_as.c
@@ -21,6 +21,8 @@
*
*/

+#include "config.h"
+
#include <string.h>
#include <errno.h>
#include <unistd.h>
diff --git a/src/ss7_as.h b/src/ss7_as.h
index b787a92..50df338 100644
--- a/src/ss7_as.h
+++ b/src/ss7_as.h
@@ -1,5 +1,7 @@
#pragma once

+#include "config.h"
+
#include <stdint.h>
#include <osmocom/core/linuxlist.h>
#include <osmocom/core/fsm.h>
diff --git a/src/ss7_as_vty.c b/src/ss7_as_vty.c
index 7878825..f7f3cfe 100644
--- a/src/ss7_as_vty.c
+++ b/src/ss7_as_vty.c
@@ -21,6 +21,8 @@
*
*/

+#include "config.h"
+
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
diff --git a/src/ss7_asp.c b/src/ss7_asp.c
index 076d91f..161e070 100644
--- a/src/ss7_asp.c
+++ b/src/ss7_asp.c
@@ -21,6 +21,8 @@
*
*/

+#include "config.h"
+
#include <string.h>
#include <errno.h>
#include <unistd.h>
diff --git a/src/ss7_asp.h b/src/ss7_asp.h
index 5d8002c..da4257a 100644
--- a/src/ss7_asp.h
+++ b/src/ss7_asp.h
@@ -1,5 +1,7 @@
#pragma once

+#include "config.h"
+
#include <stdint.h>
#include <osmocom/core/linuxlist.h>
#include <osmocom/core/fsm.h>
diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c
index 9cdaca8..49177a1 100644
--- a/src/ss7_asp_vty.c
+++ b/src/ss7_asp_vty.c
@@ -21,6 +21,8 @@
*
*/

+#include "config.h"
+
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
diff --git a/src/ss7_vty.c b/src/ss7_vty.c
index e880819..6e603df 100644
--- a/src/ss7_vty.c
+++ b/src/ss7_vty.c
@@ -20,6 +20,8 @@
*
*/

+#include "config.h"
+
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c
index b0f26fb..f70e313 100644
--- a/src/xua_asp_fsm.c
+++ b/src/xua_asp_fsm.c
@@ -9,6 +9,8 @@
* osmo-ss7.git
*/

+#include "config.h"
+
#include <errno.h>

#include <osmocom/core/fsm.h>
diff --git a/stp/stp_main.c b/stp/stp_main.c
index 2d31ef0..fb5d202 100644
--- a/stp/stp_main.c
+++ b/stp/stp_main.c
@@ -18,6 +18,8 @@
*
*/

+#include "config.h"
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c
index 739d786..977f1f4 100644
--- a/tests/ss7/ss7_test.c
+++ b/tests/ss7/ss7_test.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
#include "../src/ss7_as.h"
#include "../src/ss7_asp.h"
#include "../src/ss7_link.h"
diff --git a/tests/vty/ss7_asp_vty_test.c b/tests/vty/ss7_asp_vty_test.c
index 5423f6f..70a0c32 100644
--- a/tests/vty/ss7_asp_vty_test.c
+++ b/tests/vty/ss7_asp_vty_test.c
@@ -17,6 +17,8 @@
*
*/

+#include "config.h"
+
#define _GNU_SOURCE
#include <getopt.h>


To view, visit change 41522. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I15c25b04dc7ef62f46e2429042613ff8f7ca9ce9
Gerrit-Change-Number: 41522
Gerrit-PatchSet: 7
Gerrit-Owner: daniel <dwillmann@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>