On Sat, May 14, 2016 at 9:25 AM, Ting-Yuan Huang <laszio.hu...@gmail.com> wrote:
> From: Ting-Yuan Huang <las...@chromium.org>
>
> This patch makes declarations bind to definitions within the same module
> to prevent the potential ambiguity if referenced directly.
>
> AddressSanitizer think they violated one definition rule, although
> those symbols are accessed by address through their modules and do
> not depend on the order of the libararies loaded.
>
Pushed to git master, thanks.
> ---
> plugins/altair/mm-plugin-altair-lte.c | 4 ++--
> plugins/anydata/mm-plugin-anydata.c | 4 ++--
> plugins/cinterion/mm-plugin-cinterion.c | 4 ++--
> plugins/dell/mm-plugin-dell.c | 4 ++--
> plugins/generic/mm-plugin-generic.c | 4 ++--
> plugins/haier/mm-plugin-haier.c | 4 ++--
> plugins/huawei/mm-plugin-huawei.c | 4 ++--
> plugins/iridium/mm-plugin-iridium.c | 4 ++--
> plugins/linktop/mm-plugin-linktop.c | 4 ++--
> plugins/longcheer/mm-plugin-longcheer.c | 4 ++--
> plugins/mbm/mm-plugin-mbm.c | 4 ++--
> plugins/motorola/mm-plugin-motorola.c | 4 ++--
> plugins/mtk/mm-plugin-mtk.c | 4 ++--
> plugins/nokia/mm-plugin-nokia-icera.c | 4 ++--
> plugins/nokia/mm-plugin-nokia.c | 4 ++--
> plugins/novatel/mm-plugin-novatel-lte.c | 4 ++--
> plugins/novatel/mm-plugin-novatel.c | 4 ++--
> plugins/option/mm-plugin-hso.c | 4 ++--
> plugins/option/mm-plugin-option.c | 4 ++--
> plugins/pantech/mm-plugin-pantech.c | 4 ++--
> plugins/samsung/mm-plugin-samsung.c | 4 ++--
> plugins/sierra/mm-plugin-sierra-legacy.c | 4 ++--
> plugins/sierra/mm-plugin-sierra.c | 4 ++--
> plugins/simtech/mm-plugin-simtech.c | 4 ++--
> plugins/telit/mm-plugin-telit.c | 4 ++--
> plugins/thuraya/mm-plugin-thuraya.c | 4 ++--
> plugins/via/mm-plugin-via.c | 4 ++--
> plugins/wavecom/mm-plugin-wavecom.c | 4 ++--
> plugins/x22x/mm-plugin-x22x.c | 4 ++--
> plugins/zte/mm-plugin-zte.c | 4 ++--
> src/mm-plugin.h | 9 +++++++++
> 31 files changed, 69 insertions(+), 60 deletions(-)
>
> diff --git a/plugins/altair/mm-plugin-altair-lte.c
> b/plugins/altair/mm-plugin-altair-lte.c
> index 4201548..751a6df 100644
> --- a/plugins/altair/mm-plugin-altair-lte.c
> +++ b/plugins/altair/mm-plugin-altair-lte.c
> @@ -31,8 +31,8 @@
>
> G_DEFINE_TYPE (MMPluginAltairLte, mm_plugin_altair_lte, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
> /* Custom commands for AT probing */
> diff --git a/plugins/anydata/mm-plugin-anydata.c
> b/plugins/anydata/mm-plugin-anydata.c
> index 73df9e0..ff76697 100644
> --- a/plugins/anydata/mm-plugin-anydata.c
> +++ b/plugins/anydata/mm-plugin-anydata.c
> @@ -31,8 +31,8 @@
>
> G_DEFINE_TYPE (MMPluginAnydata, mm_plugin_anydata, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
>
> diff --git a/plugins/cinterion/mm-plugin-cinterion.c
> b/plugins/cinterion/mm-plugin-cinterion.c
> index 8af0a2a..2ee561a 100644
> --- a/plugins/cinterion/mm-plugin-cinterion.c
> +++ b/plugins/cinterion/mm-plugin-cinterion.c
> @@ -37,8 +37,8 @@
>
> G_DEFINE_TYPE (MMPluginCinterion, mm_plugin_cinterion, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
> /* Custom init */
> diff --git a/plugins/dell/mm-plugin-dell.c b/plugins/dell/mm-plugin-dell.c
> index a8f7ad6..2ed4375 100644
> --- a/plugins/dell/mm-plugin-dell.c
> +++ b/plugins/dell/mm-plugin-dell.c
> @@ -47,8 +47,8 @@
>
> G_DEFINE_TYPE (MMPluginDell, mm_plugin_dell, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
> #define TAG_DELL_MANUFACTURER "dell-manufacturer"
> typedef enum {
> diff --git a/plugins/generic/mm-plugin-generic.c
> b/plugins/generic/mm-plugin-generic.c
> index b9bea6a..8fd0bdc 100644
> --- a/plugins/generic/mm-plugin-generic.c
> +++ b/plugins/generic/mm-plugin-generic.c
> @@ -43,8 +43,8 @@
>
> G_DEFINE_TYPE (MMPluginGeneric, mm_plugin_generic, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
>
> diff --git a/plugins/haier/mm-plugin-haier.c b/plugins/haier/mm-plugin-haier.c
> index efdeb9b..ccc26b0 100644
> --- a/plugins/haier/mm-plugin-haier.c
> +++ b/plugins/haier/mm-plugin-haier.c
> @@ -25,8 +25,8 @@
>
> G_DEFINE_TYPE (MMPluginHaier, mm_plugin_haier, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
>
> diff --git a/plugins/huawei/mm-plugin-huawei.c
> b/plugins/huawei/mm-plugin-huawei.c
> index 8556283..5d556e7 100644
> --- a/plugins/huawei/mm-plugin-huawei.c
> +++ b/plugins/huawei/mm-plugin-huawei.c
> @@ -38,8 +38,8 @@
>
> G_DEFINE_TYPE (MMPluginHuawei, mm_plugin_huawei, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
> /* Custom init */
> diff --git a/plugins/iridium/mm-plugin-iridium.c
> b/plugins/iridium/mm-plugin-iridium.c
> index 3f504a2..d79df0f 100644
> --- a/plugins/iridium/mm-plugin-iridium.c
> +++ b/plugins/iridium/mm-plugin-iridium.c
> @@ -33,8 +33,8 @@
>
> G_DEFINE_TYPE (MMPluginIridium, mm_plugin_iridium, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
> static MMBaseModem *
> create_modem (MMPlugin *self,
> diff --git a/plugins/linktop/mm-plugin-linktop.c
> b/plugins/linktop/mm-plugin-linktop.c
> index 8919d4b..7fb41a3 100644
> --- a/plugins/linktop/mm-plugin-linktop.c
> +++ b/plugins/linktop/mm-plugin-linktop.c
> @@ -26,8 +26,8 @@
>
> G_DEFINE_TYPE (MMPluginLinktop, mm_plugin_linktop, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
>
> diff --git a/plugins/longcheer/mm-plugin-longcheer.c
> b/plugins/longcheer/mm-plugin-longcheer.c
> index 37d22e7..59f2d8e 100644
> --- a/plugins/longcheer/mm-plugin-longcheer.c
> +++ b/plugins/longcheer/mm-plugin-longcheer.c
> @@ -28,8 +28,8 @@
>
> G_DEFINE_TYPE (MMPluginLongcheer, mm_plugin_longcheer, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
> /* Custom init */
> diff --git a/plugins/mbm/mm-plugin-mbm.c b/plugins/mbm/mm-plugin-mbm.c
> index e71a0ee..2000444 100644
> --- a/plugins/mbm/mm-plugin-mbm.c
> +++ b/plugins/mbm/mm-plugin-mbm.c
> @@ -33,8 +33,8 @@
>
> G_DEFINE_TYPE (MMPluginMbm, mm_plugin_mbm, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
>
> diff --git a/plugins/motorola/mm-plugin-motorola.c
> b/plugins/motorola/mm-plugin-motorola.c
> index f25d9a2..96d7e4f 100644
> --- a/plugins/motorola/mm-plugin-motorola.c
> +++ b/plugins/motorola/mm-plugin-motorola.c
> @@ -27,8 +27,8 @@
>
> G_DEFINE_TYPE (MMPluginMotorola, mm_plugin_motorola, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
>
> diff --git a/plugins/mtk/mm-plugin-mtk.c b/plugins/mtk/mm-plugin-mtk.c
> index d734c8a..5d3ea7d 100644
> --- a/plugins/mtk/mm-plugin-mtk.c
> +++ b/plugins/mtk/mm-plugin-mtk.c
> @@ -27,8 +27,8 @@
>
> G_DEFINE_TYPE (MMPluginMtk, mm_plugin_mtk, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
>
> diff --git a/plugins/nokia/mm-plugin-nokia-icera.c
> b/plugins/nokia/mm-plugin-nokia-icera.c
> index 3ee1e47..58428e7 100644
> --- a/plugins/nokia/mm-plugin-nokia-icera.c
> +++ b/plugins/nokia/mm-plugin-nokia-icera.c
> @@ -26,8 +26,8 @@
>
> G_DEFINE_TYPE (MMPluginNokiaIcera, mm_plugin_nokia_icera, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
> /* Custom commands for AT probing */
> diff --git a/plugins/nokia/mm-plugin-nokia.c b/plugins/nokia/mm-plugin-nokia.c
> index da8187d..a3e4749 100644
> --- a/plugins/nokia/mm-plugin-nokia.c
> +++ b/plugins/nokia/mm-plugin-nokia.c
> @@ -27,8 +27,8 @@
>
> G_DEFINE_TYPE (MMPluginNokia, mm_plugin_nokia, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
> /* Custom commands for AT probing */
> diff --git a/plugins/novatel/mm-plugin-novatel-lte.c
> b/plugins/novatel/mm-plugin-novatel-lte.c
> index e5fd91d..0a7d2fb 100644
> --- a/plugins/novatel/mm-plugin-novatel-lte.c
> +++ b/plugins/novatel/mm-plugin-novatel-lte.c
> @@ -30,8 +30,8 @@
>
> G_DEFINE_TYPE (MMPluginNovatelLte, mm_plugin_novatel_lte, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
> static MMBaseModem *
> create_modem (MMPlugin *self,
> diff --git a/plugins/novatel/mm-plugin-novatel.c
> b/plugins/novatel/mm-plugin-novatel.c
> index 9476150..ccbd9a8 100644
> --- a/plugins/novatel/mm-plugin-novatel.c
> +++ b/plugins/novatel/mm-plugin-novatel.c
> @@ -39,8 +39,8 @@
>
> G_DEFINE_TYPE (MMPluginNovatel, mm_plugin_novatel, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
>
> diff --git a/plugins/option/mm-plugin-hso.c b/plugins/option/mm-plugin-hso.c
> index 94400c1..df5d34f 100644
> --- a/plugins/option/mm-plugin-hso.c
> +++ b/plugins/option/mm-plugin-hso.c
> @@ -28,8 +28,8 @@
>
> G_DEFINE_TYPE (MMPluginHso, mm_plugin_hso, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
> /* Custom init */
> diff --git a/plugins/option/mm-plugin-option.c
> b/plugins/option/mm-plugin-option.c
> index 010e597..77f8d76 100644
> --- a/plugins/option/mm-plugin-option.c
> +++ b/plugins/option/mm-plugin-option.c
> @@ -27,8 +27,8 @@
>
> G_DEFINE_TYPE (MMPluginOption, mm_plugin_option, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
>
> diff --git a/plugins/pantech/mm-plugin-pantech.c
> b/plugins/pantech/mm-plugin-pantech.c
> index 788a45d..b7b1791 100644
> --- a/plugins/pantech/mm-plugin-pantech.c
> +++ b/plugins/pantech/mm-plugin-pantech.c
> @@ -29,8 +29,8 @@
>
> G_DEFINE_TYPE (MMPluginPantech, mm_plugin_pantech, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
> /* Custom commands for AT probing
> diff --git a/plugins/samsung/mm-plugin-samsung.c
> b/plugins/samsung/mm-plugin-samsung.c
> index 634c625..5434ad1 100644
> --- a/plugins/samsung/mm-plugin-samsung.c
> +++ b/plugins/samsung/mm-plugin-samsung.c
> @@ -31,8 +31,8 @@
>
> G_DEFINE_TYPE (MMPluginSamsung, mm_plugin_samsung, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
> static MMBaseModem *
> create_modem (MMPlugin *self,
> diff --git a/plugins/sierra/mm-plugin-sierra-legacy.c
> b/plugins/sierra/mm-plugin-sierra-legacy.c
> index 9064bcf..ac488cd 100644
> --- a/plugins/sierra/mm-plugin-sierra-legacy.c
> +++ b/plugins/sierra/mm-plugin-sierra-legacy.c
> @@ -30,8 +30,8 @@
>
> G_DEFINE_TYPE (MMPluginSierraLegacy, mm_plugin_sierra_legacy, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
>
> diff --git a/plugins/sierra/mm-plugin-sierra.c
> b/plugins/sierra/mm-plugin-sierra.c
> index 211cd8a..b6eabc4 100644
> --- a/plugins/sierra/mm-plugin-sierra.c
> +++ b/plugins/sierra/mm-plugin-sierra.c
> @@ -36,8 +36,8 @@
>
> G_DEFINE_TYPE (MMPluginSierra, mm_plugin_sierra, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
>
> diff --git a/plugins/simtech/mm-plugin-simtech.c
> b/plugins/simtech/mm-plugin-simtech.c
> index a38942d..fcaa250 100644
> --- a/plugins/simtech/mm-plugin-simtech.c
> +++ b/plugins/simtech/mm-plugin-simtech.c
> @@ -27,8 +27,8 @@
>
> G_DEFINE_TYPE (MMPluginSimtech, mm_plugin_simtech, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
>
> diff --git a/plugins/telit/mm-plugin-telit.c b/plugins/telit/mm-plugin-telit.c
> index a4f79b4..5a44ba6 100644
> --- a/plugins/telit/mm-plugin-telit.c
> +++ b/plugins/telit/mm-plugin-telit.c
> @@ -30,8 +30,8 @@
>
> G_DEFINE_TYPE (MMPluginTelit, mm_plugin_telit, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
>
> diff --git a/plugins/thuraya/mm-plugin-thuraya.c
> b/plugins/thuraya/mm-plugin-thuraya.c
> index ae7bf77..1c0782d 100644
> --- a/plugins/thuraya/mm-plugin-thuraya.c
> +++ b/plugins/thuraya/mm-plugin-thuraya.c
> @@ -35,8 +35,8 @@
>
> G_DEFINE_TYPE (MMPluginThuraya, mm_plugin_thuraya, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
> static MMBaseModem *
> create_modem (MMPlugin *self,
> diff --git a/plugins/via/mm-plugin-via.c b/plugins/via/mm-plugin-via.c
> index 3a06b5f..d3e6762 100644
> --- a/plugins/via/mm-plugin-via.c
> +++ b/plugins/via/mm-plugin-via.c
> @@ -31,8 +31,8 @@
>
> G_DEFINE_TYPE (MMPluginVia, mm_plugin_via, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
> static MMBaseModem *
> create_modem (MMPlugin *self,
> diff --git a/plugins/wavecom/mm-plugin-wavecom.c
> b/plugins/wavecom/mm-plugin-wavecom.c
> index 39fa27a..9d3307c 100644
> --- a/plugins/wavecom/mm-plugin-wavecom.c
> +++ b/plugins/wavecom/mm-plugin-wavecom.c
> @@ -33,8 +33,8 @@
>
> G_DEFINE_TYPE (MMPluginWavecom, mm_plugin_wavecom, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
>
> diff --git a/plugins/x22x/mm-plugin-x22x.c b/plugins/x22x/mm-plugin-x22x.c
> index db5f25b..68b897f 100644
> --- a/plugins/x22x/mm-plugin-x22x.c
> +++ b/plugins/x22x/mm-plugin-x22x.c
> @@ -32,8 +32,8 @@
>
> G_DEFINE_TYPE (MMPluginX22x, mm_plugin_x22x, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
> /* Custom init */
> diff --git a/plugins/zte/mm-plugin-zte.c b/plugins/zte/mm-plugin-zte.c
> index fff1a4c..075c314 100644
> --- a/plugins/zte/mm-plugin-zte.c
> +++ b/plugins/zte/mm-plugin-zte.c
> @@ -36,8 +36,8 @@
>
> G_DEFINE_TYPE (MMPluginZte, mm_plugin_zte, MM_TYPE_PLUGIN)
>
> -int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> -int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +MM_PLUGIN_DEFINE_MAJOR_VERSION
> +MM_PLUGIN_DEFINE_MINOR_VERSION
>
>
> /*****************************************************************************/
> /* Custom commands for AT probing */
> diff --git a/src/mm-plugin.h b/src/mm-plugin.h
> index ee03686..0491679 100644
> --- a/src/mm-plugin.h
> +++ b/src/mm-plugin.h
> @@ -31,6 +31,15 @@
> #define MM_PLUGIN_MAJOR_VERSION 4
> #define MM_PLUGIN_MINOR_VERSION 0
>
> +#if defined (G_HAVE_GNUC_VISIBILITY)
> +#define VISIBILITY __attribute__((visibility("protected")))
> +#else
> +#define VISIBILITY
> +#endif
> +
> +#define MM_PLUGIN_DEFINE_MAJOR_VERSION VISIBILITY int
> mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
> +#define MM_PLUGIN_DEFINE_MINOR_VERSION VISIBILITY int
> mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
> +
> #define MM_TYPE_PLUGIN (mm_plugin_get_type ())
> #define MM_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
> MM_TYPE_PLUGIN, MMPlugin))
> #define MM_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
> MM_TYPE_PLUGIN, MMPluginClass))
> --
> 2.8.0.rc3.226.g39d4020
>
> _______________________________________________
> ModemManager-devel mailing list
> ModemManager-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/modemmanager-devel
--
Aleksander
https://aleksander.es
_______________________________________________
ModemManager-devel mailing list
ModemManager-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/modemmanager-devel
