pidgin/pidgin

Create a glibcompat.h to define G_GNUC_(BEGIN,END)_IGNORE_DEPRECATIONS which was added in 2.32.0 but we only require 2.16.0
release-2.x.y
2019-11-11, Gary Kramlich
dc5e8cca7434
Parents 7ab560390e2f
Children 43e0ebb91028
Create a glibcompat.h to define G_GNUC_(BEGIN,END)_IGNORE_DEPRECATIONS which was added in 2.32.0 but we only require 2.16.0
4 files changed, 63 insertions(+), 28 deletions(-)
  • +1 -0
    libpurple/Makefile.am
  • +60 -0
    libpurple/glibcompat.h
  • +1 -28
    libpurple/internal.h
  • +1 -0
    libpurple/media.h
    • --- a/libpurple/Makefile.am Tue Nov 05 22:51:01 2019 -0600
    +++ b/libpurple/Makefile.am Mon Nov 11 01:32:42 2019 -0600
    @@ -115,6 +115,7 @@
    eventloop.h \
    ft.h \
    gaim-compat.h \
    + glibcompat.h \
    idle.h \
    imgstore.h \
    log.h \
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/libpurple/glibcompat.h Mon Nov 11 01:32:42 2019 -0600
    @@ -0,0 +1,60 @@
    +/**
    + * @file glibcompat.h Compatibility for many glib versions.
    + * @ingroup core
    + */
    +
    +/* purple
    + *
    + * Purple is the legal property of its developers, whose names are too numerous
    + * to list here. Please refer to the COPYRIGHT file distributed with this
    + * source distribution.
    + *
    + * This program is free software; you can redistribute it and/or modify
    + * it under the terms of the GNU General Public License as published by
    + * the Free Software Foundation; either version 2 of the License, or
    + * (at your option) any later version.
    + *
    + * This program is distributed in the hope that it will be useful,
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    + * GNU General Public License for more details.
    + *
    + * You should have received a copy of the GNU General Public License
    + * along with this program; if not, write to the Free Software
    + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    + */
    +
    +#ifndef PURPLE_GLIBCOMPAT_H
    +#define PURPLE_GLIBCOMPAT_H
    +
    +#include <glib.h>
    +
    +/* This wasn't introduced until Glib 2.14 :( */
    +#ifndef G_MAXSSIZE
    +# if GLIB_SIZEOF_LONG == 8
    +# define G_MAXSSIZE ((gssize) 0x7fffffffffffffff)
    +# else
    +# define G_MAXSSIZE ((gssize) 0x7fffffff)
    +# endif
    +#endif
    +
    +#if !GLIB_CHECK_VERSION(2,32,0)
    +# define G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    +# define G_GNUC_END_IGNORE_DEPRECATIONS
    +#endif /* !GLIB_CHECK_VERSION(2,32,0) */
    +
    +#ifdef __clang__
    +
    +#undef G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    +#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
    + _Pragma ("clang diagnostic push") \
    + _Pragma ("clang diagnostic ignored \"-Wdeprecated-declarations\"")
    +
    +#undef G_GNUC_END_IGNORE_DEPRECATIONS
    +#define G_GNUC_END_IGNORE_DEPRECATIONS \
    + _Pragma ("clang diagnostic pop")
    +
    +#endif /* __clang__ */
    +
    +#endif /* PURPLE_GLIBCOMPAT_H */
    +
    --- a/libpurple/internal.h Tue Nov 05 22:51:01 2019 -0600
    +++ b/libpurple/internal.h Mon Nov 11 01:32:42 2019 -0600
    @@ -124,14 +124,7 @@
    #include <glib.h>
    -/* This wasn't introduced until Glib 2.14 :( */
    -#ifndef G_MAXSSIZE
    -# if GLIB_SIZEOF_LONG == 8
    -# define G_MAXSSIZE ((gssize) 0x7fffffffffffffff)
    -# else
    -# define G_MAXSSIZE ((gssize) 0x7fffffff)
    -# endif
    -#endif
    +#include "glibcompat.h"
    #include <glib/gstdio.h>
    @@ -151,26 +144,6 @@
    #include <glib-object.h>
    -#if !GLIB_CHECK_VERSION(2, 32, 0)
    -
    -#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    -#define G_GNUC_END_IGNORE_DEPRECATIONS
    -
    -#endif /* 2.32.0 */
    -
    -#ifdef __clang__
    -
    -#undef G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    -#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
    - _Pragma ("clang diagnostic push") \
    - _Pragma ("clang diagnostic ignored \"-Wdeprecated-declarations\"")
    -
    -#undef G_GNUC_END_IGNORE_DEPRECATIONS
    -#define G_GNUC_END_IGNORE_DEPRECATIONS \
    - _Pragma ("clang diagnostic pop")
    -
    -#endif /* __clang__ */
    -
    #ifdef __COVERITY__
    /* avoid TAINTED_SCALAR warning */
    --- a/libpurple/media.h Tue Nov 05 22:51:01 2019 -0600
    +++ b/libpurple/media.h Mon Nov 11 01:32:42 2019 -0600
    @@ -30,6 +30,7 @@
    #include "media/candidate.h"
    #include "media/codec.h"
    #include "media/enum-types.h"
    +#include "glibcompat.h"
    #include <glib.h>
    #include <glib-object.h>