diff options
| author | Harald Welte <laforge@osmocom.org> | 2020-04-20 20:09:24 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2020-07-26 11:48:22 +0200 |
| commit | 2bb3d23f8703e452ebf0a7e725dda6365dbb9b57 (patch) | |
| tree | 25e0b1c795d9a34f5b78cdc541ea297b4710a263 /include | |
| parent | ee8f4b0a91dff21c2d7d8361afb6b41637fcdc29 (diff) | |
fix compilation with gcc-10
/usr/bin/ld: /home/laforge/projects/git/osmo-bts/tests/sysmobts/../../src/osmo-bts-sysmo/tch.c:584: undefined reference to `femtobts_tch_pl_names'
/usr/bin/ld: l1_transp_hw.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:108: multiple definition of `pdch_msu_size'; main.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:108: first defined here
/usr/bin/ld: l1_transp_hw.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:71: multiple definition of `femtobts_l1prim_type'; main.o:/home/laforge/projects/git/osmo-bts/src/osmo-bts-sysmo/femtobts.h:71: first defined here
see also: https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000651.html
Change-Id: I4a9896153876fcda496365776883827746205f00
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmo-bts/gsm_data_shared.h | 8 | ||||
| -rw-r--r-- | include/osmo-bts/scheduler_backend.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 41998ad8..3943e500 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -342,13 +342,13 @@ static inline const char *lchan_ciph_state_name(uint8_t state) { return get_value_string(lchan_ciph_state_names, state); } -enum { +enum gsm_bts_trx_ts_flags { TS_F_PDCH_ACTIVE = 0x1000, TS_F_PDCH_ACT_PENDING = 0x2000, TS_F_PDCH_DEACT_PENDING = 0x4000, TS_F_PDCH_PENDING_MASK = 0x6000 /*< TS_F_PDCH_ACT_PENDING | TS_F_PDCH_DEACT_PENDING */ -} gsm_bts_trx_ts_flags; +}; /* One Timeslot in a TRX */ struct gsm_bts_trx_ts { @@ -793,8 +793,8 @@ enum gsm_bts_type_variant str2btsvariant(const char *arg); const char *btsvariant2str(enum gsm_bts_type_variant v); extern const struct value_string gsm_chreq_descs[]; -const struct value_string gsm_pchant_names[13]; -const struct value_string gsm_pchant_descs[13]; +extern const struct value_string gsm_pchant_names[13]; +extern const struct value_string gsm_pchant_descs[13]; const char *gsm_pchan_name(enum gsm_phys_chan_config c); enum gsm_phys_chan_config gsm_pchan_parse(const char *name); const char *gsm_lchant_name(enum gsm_chan_t c); diff --git a/include/osmo-bts/scheduler_backend.h b/include/osmo-bts/scheduler_backend.h index 51c957cc..c52bc70b 100644 --- a/include/osmo-bts/scheduler_backend.h +++ b/include/osmo-bts/scheduler_backend.h @@ -40,8 +40,8 @@ extern const struct trx_chan_desc trx_chan_desc[_TRX_CHAN_MAX]; extern const ubit_t _sched_tsc[8][26]; extern const ubit_t _sched_egprs_tsc[8][78]; -const ubit_t _sched_fcch_burst[148]; -const ubit_t _sched_sch_train[64]; +extern const ubit_t _sched_fcch_burst[148]; +extern const ubit_t _sched_sch_train[64]; struct msgb *_sched_dequeue_prim(struct l1sched_trx *l1t, int8_t tn, uint32_t fn, enum trx_chan_type chan); |