From 4f6b1e46a5da45e78ed6097406a6976b4423c933 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@eurecom.fr>
Date: Sat, 23 Mar 2019 17:10:43 +0100
Subject: [PATCH] Remove warnings for DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER()
 include

---
 openair2/F1AP/f1ap_du_rrc_message_transfer.c | 2 +-
 openair2/F1AP/f1ap_du_rrc_message_transfer.h | 4 +++-
 openair2/RRC/LTE/L2_interface.c              | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/openair2/F1AP/f1ap_du_rrc_message_transfer.c b/openair2/F1AP/f1ap_du_rrc_message_transfer.c
index 1a0494eccc..bb477f5696 100644
--- a/openair2/F1AP/f1ap_du_rrc_message_transfer.c
+++ b/openair2/F1AP/f1ap_du_rrc_message_transfer.c
@@ -756,7 +756,7 @@ int DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(module_id_t     module_idP,
                                             int             CC_idP,
                                             int             UE_id,
                                             rnti_t          rntiP,
-                                            uint8_t        *sduP,
+                                            const uint8_t   *sduP,
                                             sdu_size_t      sdu_lenP) {
   F1AP_F1AP_PDU_t                       pdu;
   F1AP_InitialULRRCMessageTransfer_t    *out;
diff --git a/openair2/F1AP/f1ap_du_rrc_message_transfer.h b/openair2/F1AP/f1ap_du_rrc_message_transfer.h
index 6ffc3914fe..1406e48f3d 100644
--- a/openair2/F1AP/f1ap_du_rrc_message_transfer.h
+++ b/openair2/F1AP/f1ap_du_rrc_message_transfer.h
@@ -34,6 +34,8 @@
 #ifndef F1AP_DU_RRC_MESSAGE_TRANSFER_H_
 #define F1AP_DU_RRC_MESSAGE_TRANSFER_H_
 
+#include "f1ap_common.h"
+
 int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t       instance,
                                       uint32_t         assoc_id,
                                       uint32_t         stream,
@@ -45,7 +47,7 @@ int DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(module_id_t     module_idP,
                                             int             CC_idP,
                                             int             UE_id,
                                             rnti_t          rntiP,
-                                            uint8_t        *sduP,
+                                            const uint8_t   *sduP,
                                             sdu_size_t      sdu_lenP);
 
 #endif /* F1AP_DU_RRC_MESSAGE_TRANSFER_H_ */
diff --git a/openair2/RRC/LTE/L2_interface.c b/openair2/RRC/LTE/L2_interface.c
index b9e95f9bd6..295847542a 100644
--- a/openair2/RRC/LTE/L2_interface.c
+++ b/openair2/RRC/LTE/L2_interface.c
@@ -42,7 +42,8 @@
 #endif
 
 #include "flexran_agent_extern.h"
-
+#undef C_RNTI // C_RNTI is used in F1AP generated code, prevent preprocessor replace
+#include "f1ap_du_rrc_message_transfer.h"
 
 extern RAN_CONTEXT_t RC;