diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2015-04-11 19:31:03 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2015-04-11 19:31:03 +0200 |
| commit | c2b4458e0789dcf42bd0fb7498d97c041aca87be (patch) | |
| tree | 154d853b0dd6e75e81916e0410cd2ff31efd9667 | |
| parent | 1885395551fb9a34145e9e242754ba3b2a9aa09e (diff) | |
sim: Use extern for these structs to generate a linkage
Fixes:
duplicate symbol _ts102221_fcp_vals in:
.libs/core.o
.libs/card_fs_usim.o
duplicate symbol _pcsc_reader_ops in:
.libs/reader.o
.libs/card_fs_usim.o
| -rw-r--r-- | include/osmocom/sim/sim.h | 2 | ||||
| -rw-r--r-- | src/sim/sim_int.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/osmocom/sim/sim.h b/include/osmocom/sim/sim.h index 02cdcad5..bb4b7d8e 100644 --- a/include/osmocom/sim/sim.h +++ b/include/osmocom/sim/sim.h @@ -294,7 +294,7 @@ struct osim_card_hdl; char *osim_print_sw(const struct osim_card_hdl *ch, uint16_t sw_in); extern const struct tlv_definition ts102221_fcp_tlv_def; -const struct value_string ts102221_fcp_vals[14]; +extern const struct value_string ts102221_fcp_vals[14]; /* 11.1.1.3 */ enum ts102221_fcp_tag { diff --git a/src/sim/sim_int.h b/src/sim/sim_int.h index c10c5f08..70247437 100644 --- a/src/sim/sim_int.h +++ b/src/sim/sim_int.h @@ -36,6 +36,6 @@ struct osim_reader_ops { int (*transceive)(struct osim_reader_hdl *rh, struct msgb *msg); }; -const struct osim_reader_ops pcsc_reader_ops; +extern const struct osim_reader_ops pcsc_reader_ops; #endif |