[libvirt] [libvirt-glib 2/3] gconfig: Drop redundant glib compatibility code

Christophe Fergeau cfergeau at redhat.com
Mon Nov 23 12:55:41 UTC 2015


I don't know why this one is 2/3, I would squash it with the other
similar gobject patch. ACK.

Christophe

On Fri, Nov 20, 2015 at 09:05:23PM +0000, Zeeshan Ali (Khattak) wrote:
> We already require and use glib >= 2.36 so there is no reason to keep
> around code to ensure compatibility with glib older than that.
> ---
>  libvirt-gconfig/libvirt-gconfig-compat.h | 20 --------------------
>  1 file changed, 20 deletions(-)
> 
> diff --git a/libvirt-gconfig/libvirt-gconfig-compat.h b/libvirt-gconfig/libvirt-gconfig-compat.h
> index fbf552c..c9ac645 100644
> --- a/libvirt-gconfig/libvirt-gconfig-compat.h
> +++ b/libvirt-gconfig/libvirt-gconfig-compat.h
> @@ -25,26 +25,6 @@
>  
>  #include <glib-object.h>
>  
> -#if !GLIB_CHECK_VERSION(2,32,0)
> -
> -#if    __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
> -#define G_DEPRECATED __attribute__((__deprecated__))
> -#elif defined(_MSC_VER) && (_MSC_VER >= 1300)
> -#define G_DEPRECATED __declspec(deprecated)
> -#else
> -#define G_DEPRECATED
> -#endif
> -
> -#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
> -#define G_DEPRECATED_FOR(f) __attribute__((__deprecated__("Use '" #f "' instead")))
> -#elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320)
> -#define G_DEPRECATED_FOR(f) __declspec(deprecated("is deprecated. Use '" #f "' instead"))
> -#else
> -#define G_DEPRECATED_FOR(f) G_DEPRECATED
> -#endif
> -
> -#endif
> -
>  #if GLIB_CHECK_VERSION(2, 35, 0)
>  #define g_type_init()
>  #endif
> -- 
> 2.5.0
> 
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20151123/d6dae827/attachment-0001.sig>


More information about the libvir-list mailing list