commit c2b4458e0789dcf42bd0fb7498d97c041aca87be
author Holger Hans Peter Freyther <holger@moiji-mobile.com> Sat Apr 11 19:31:03 2015 +0200
committer Holger Hans Peter Freyther <holger@moiji-mobile.com> Sat Apr 11 19:31:03 2015 +0200
tree 154d853b0dd6e75e81916e0410cd2ff31efd9667
parent 1885395551fb9a34145e9e242754ba3b2a9aa09e

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

include/osmocom/sim/sim.h

diff --git a/include/osmocom/sim/sim.h b/include/osmocom/sim/sim.h
index 02cdcad..bb4b7d8 100644
--- a/include/osmocom/sim/sim.h
+++ b/include/osmocom/sim/sim.h
@@ -294,7 +294,7 @@
 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 {

src/sim/sim_int.h

diff --git a/src/sim/sim_int.h b/src/sim/sim_int.h
index c10c5f0..7024743 100644
--- a/src/sim/sim_int.h
+++ b/src/sim/sim_int.h
@@ -36,6 +36,6 @@
 	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