From 9840b1d5ce39364ef2a94a897995a92ce41cb666 Mon Sep 17 00:00:00 2001 From: Slava Monich Date: Wed, 13 May 2020 01:22:32 +0300 Subject: [PATCH] [gsupplicant] Fix warning: G_ADD_PRIVATE. JB#41874 There seems to be no way to disable this warning other than by disabling all glib deprecation warnings for the entire file. So be it. --- src/gsupplicant_bss.c | 10 ++++++---- src/gsupplicant_interface.c | 10 ++++++---- src/gsupplicant_network.c | 10 ++++++---- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/gsupplicant_bss.c b/src/gsupplicant_bss.c index 7022dfc..2390a4d 100644 --- a/src/gsupplicant_bss.c +++ b/src/gsupplicant_bss.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2015-2018 Jolla Ltd. - * Copyright (C) 2015-2018 Slava Monich + * Copyright (C) 2015-2020 Jolla Ltd. + * Copyright (C) 2015-2020 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -14,8 +14,8 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -30,6 +30,8 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS /* G_ADD_PRIVATE */ + #include "gsupplicant_bss.h" #include "gsupplicant_interface.h" #include "gsupplicant_util_p.h" diff --git a/src/gsupplicant_interface.c b/src/gsupplicant_interface.c index fa9ef9b..4044d1f 100644 --- a/src/gsupplicant_interface.c +++ b/src/gsupplicant_interface.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2015-2018 Jolla Ltd. - * Copyright (C) 2015-2018 Slava Monich + * Copyright (C) 2015-2020 Jolla Ltd. + * Copyright (C) 2015-2020 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -14,8 +14,8 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -30,6 +30,8 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS /* G_ADD_PRIVATE */ + #include "gsupplicant_interface.h" #include "gsupplicant_network.h" #include "gsupplicant_bss.h" diff --git a/src/gsupplicant_network.c b/src/gsupplicant_network.c index 3fe3fad..3043623 100644 --- a/src/gsupplicant_network.c +++ b/src/gsupplicant_network.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2015-2018 Jolla Ltd. - * Copyright (C) 2015-2018 Slava Monich + * Copyright (C) 2015-2020 Jolla Ltd. + * Copyright (C) 2015-2020 Slava Monich * * You may use this file under the terms of BSD license as follows: * @@ -14,8 +14,8 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -30,6 +30,8 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS /* G_ADD_PRIVATE */ + #include "gsupplicant_network.h" #include "gsupplicant_interface.h" #include "gsupplicant_dbus.h"