Change in osmo-pcu[master]: Include pdch.h in bts.h even if we're not compiling C++

Daniel Willmann gerrit-no-reply at lists.osmocom.org
Tue Mar 26 09:40:57 UTC 2019


Daniel Willmann has submitted this change and it was merged. ( https://gerrit.osmocom.org/13361 )

Change subject: Include pdch.h in bts.h even if we're not compiling C++
......................................................................

Include pdch.h in bts.h even if we're not compiling C++

bts.h needs pdch.h whether we're compiling C or C++ code so move it out
of the #ifdef.

make[1]: Entering directory '/home/daniel/scm/osmo/oc2g/osmo-pcu-oc2g/src'
  CC       osmo-bts-oc2g/oc2g_l1_if.o
In file included from osmo-bts-oc2g/oc2g_l1_if.c:39:
./bts.h:74:26: error: array type has incomplete element type ‘struct gprs_rlcmac_pdch’
  struct gprs_rlcmac_pdch pdch[8];
                          ^~~~

Change-Id: Ib39e4424f73c677b34f921917440f211e400e14f
---
M src/bts.h
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved
  Max: Looks good to me, but someone else must approve



diff --git a/src/bts.h b/src/bts.h
index ee5a692..767605c 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -38,9 +38,9 @@
 #include "gprs_ms_storage.h"
 #include "gprs_coding_scheme.h"
 #include <cxx_linuxlist.h>
-#include <pdch.h>
 #endif
 
+#include <pdch.h>
 #include <stdint.h>
 
 #define LLC_CODEL_DISABLE 0

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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib39e4424f73c677b34f921917440f211e400e14f
Gerrit-Change-Number: 13361
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Willmann <dwillmann at sysmocom.de>
Gerrit-Reviewer: Daniel Willmann <dwillmann at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-CC: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190326/b15efa26/attachment.html>


More information about the gerrit-log mailing list