pespin has uploaded this change for review.
Move include sigtran/m2ua_types.h -> sigtran/protocol/m2ua.h
That file contains only protocol (over-the-wire) related values, similar
to already existing sigtran/protocol/m3ua.h.
Hence, move it where it should be.
This is fine since there's no user of such a header, it's only used
internally by m2ua_test.
Change-Id: I66d8a335bbd1c55edab8a120d85e6aee1922433c
---
M include/osmocom/sigtran/Makefile.am
R include/osmocom/sigtran/protocol/m2ua.h
M tests/m2ua/m2ua_test.c
3 files changed, 11 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/24/38624/1
diff --git a/include/osmocom/sigtran/Makefile.am b/include/osmocom/sigtran/Makefile.am
index d9cc20c..8d90b0b 100644
--- a/include/osmocom/sigtran/Makefile.am
+++ b/include/osmocom/sigtran/Makefile.am
@@ -1,8 +1,14 @@
-sigtran_HEADERS = xua_types.h xua_msg.h m2ua_types.h sccp_sap.h \
+sigtran_HEADERS = xua_types.h xua_msg.h sccp_sap.h \
sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h
sigtrandir = $(includedir)/osmocom/sigtran
-sigtran_prot_HEADERS = protocol/sua.h protocol/m3ua.h protocol/mtp.h \
- protocol/sccp_scmg.h
+sigtran_prot_HEADERS = \
+ protocol/sua.h \
+ protocol/m2ua.h \
+ protocol/m3ua.h \
+ protocol/mtp.h \
+ protocol/sccp_scmg.h \
+ $(NULL)
+
sigtran_protdir = $(includedir)/osmocom/sigtran/protocol
diff --git a/include/osmocom/sigtran/m2ua_types.h b/include/osmocom/sigtran/protocol/m2ua.h
similarity index 98%
rename from include/osmocom/sigtran/m2ua_types.h
rename to include/osmocom/sigtran/protocol/m2ua.h
index 7184f54..bf25086 100644
--- a/include/osmocom/sigtran/m2ua_types.h
+++ b/include/osmocom/sigtran/protocol/m2ua.h
@@ -1,5 +1,4 @@
-#ifndef m2ua_types_h
-#define m2ua_types_h
+#pragma once
/**
* Types found in the M2UA RFC 3331
@@ -251,5 +250,3 @@
M2UA_DEREG_ERR_PERM_DENIED, /* Error - Permission Denied */
M2UA_DEREG_ERR_NOT_REG, /* Error - Not Registered */
};
-
-#endif
diff --git a/tests/m2ua/m2ua_test.c b/tests/m2ua/m2ua_test.c
index 12d5d7c..3469f11 100644
--- a/tests/m2ua/m2ua_test.c
+++ b/tests/m2ua/m2ua_test.c
@@ -16,7 +16,7 @@
*/
#include <osmocom/sigtran/xua_msg.h>
-#include <osmocom/sigtran/m2ua_types.h>
+#include <osmocom/sigtran/protocol/m2ua.h>
#include <osmocom/core/utils.h>
#include <osmocom/core/msgb.h>
To view, visit change 38624. To unsubscribe, or for help writing mail filters, visit settings.