7bf10a75db
For libnm library, "nm-dbus-interface.h" contains defines like the D-Bus paths of NetworkManager. It is desirable to have this header usable without having a dependency on "glib.h", for example for a QT application. For that, commitc0852964a8removed that dependancy. For libnm-glib library, the analog to "nm-dbus-interface.h" is "NetworkManager.h", and the same applies there. Commit159e827a72removed that include. However, that broke build on PackageKit [1] which expected to get the version macros by including "NetworkManager.h". So at least for libnm-glib, we need to preserve old behavior so that a user including "NetworkManager.h" gets the version macros, but not "glib.h". Extract the version macros to a new header file "nm-version-macros.h". This header doesn't include "glib.h" and can be included from "NetworkManager.h". This gives as previous behavior and a glib-free include. For libnm we still don't include "nm-version-macros.h" to "nm-dbus-interface.h". Very few users will actually need the version macros, but not using libnm. Users that use libnm, should just include (libnm's) "NetworkManager.h" to get all headers. As a special case, a user who doesn't want to use glib/libnm, but still needs both "nm-dbus-interface.h" and "nm-version-macros.h", can include them both separately. [1] https://github.com/hughsie/PackageKit/issues/85 Fixes:4545a7fe96
94 lines
2.9 KiB
C
94 lines
2.9 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library 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
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
* Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright 2011 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef NM_VERSION_H
|
|
#define NM_VERSION_H
|
|
|
|
#include <glib.h>
|
|
|
|
#include <nm-version-macros.h>
|
|
|
|
/* Deprecation / Availability macros */
|
|
|
|
#if !defined (NM_VERSION_MIN_REQUIRED) || (NM_VERSION_MIN_REQUIRED == 0)
|
|
# undef NM_VERSION_MIN_REQUIRED
|
|
# define NM_VERSION_MIN_REQUIRED (NM_VERSION_CUR_STABLE)
|
|
#endif
|
|
|
|
#if !defined (NM_VERSION_MAX_ALLOWED) || (NM_VERSION_MAX_ALLOWED == 0)
|
|
# undef NM_VERSION_MAX_ALLOWED
|
|
# define NM_VERSION_MAX_ALLOWED (NM_VERSION_CUR_STABLE)
|
|
#endif
|
|
|
|
/* sanity checks */
|
|
#if NM_VERSION_MIN_REQUIRED > NM_VERSION_NEXT_STABLE
|
|
#error "NM_VERSION_MIN_REQUIRED must be <= NM_VERSION_NEXT_STABLE"
|
|
#endif
|
|
#if NM_VERSION_MAX_ALLOWED < NM_VERSION_MIN_REQUIRED
|
|
#error "NM_VERSION_MAX_ALLOWED must be >= NM_VERSION_MIN_REQUIRED"
|
|
#endif
|
|
#if NM_VERSION_MIN_REQUIRED < NM_VERSION_0_9_8
|
|
#error "NM_VERSION_MIN_REQUIRED must be >= NM_VERSION_0_9_8"
|
|
#endif
|
|
|
|
#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_0_9_10
|
|
# define NM_DEPRECATED_IN_0_9_10 G_DEPRECATED
|
|
# define NM_DEPRECATED_IN_0_9_10_FOR(f) G_DEPRECATED_FOR(f)
|
|
#else
|
|
# define NM_DEPRECATED_IN_0_9_10
|
|
# define NM_DEPRECATED_IN_0_9_10_FOR(f)
|
|
#endif
|
|
|
|
#if NM_VERSION_MAX_ALLOWED < NM_VERSION_0_9_10
|
|
# define NM_AVAILABLE_IN_0_9_10 G_UNAVAILABLE(0.9,10)
|
|
#else
|
|
# define NM_AVAILABLE_IN_0_9_10
|
|
#endif
|
|
|
|
#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_0
|
|
# define NM_DEPRECATED_IN_1_0 G_DEPRECATED
|
|
# define NM_DEPRECATED_IN_1_0_FOR(f) G_DEPRECATED_FOR(f)
|
|
#else
|
|
# define NM_DEPRECATED_IN_1_0
|
|
# define NM_DEPRECATED_IN_1_0_FOR(f)
|
|
#endif
|
|
|
|
#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_0
|
|
# define NM_AVAILABLE_IN_1_0 G_UNAVAILABLE(1,0)
|
|
#else
|
|
# define NM_AVAILABLE_IN_1_0
|
|
#endif
|
|
|
|
#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_2
|
|
# define NM_DEPRECATED_IN_1_2 G_DEPRECATED
|
|
# define NM_DEPRECATED_IN_1_2_FOR(f) G_DEPRECATED_FOR(f)
|
|
#else
|
|
# define NM_DEPRECATED_IN_1_2
|
|
# define NM_DEPRECATED_IN_1_2_FOR(f)
|
|
#endif
|
|
|
|
#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_2
|
|
# define NM_AVAILABLE_IN_1_2 G_UNAVAILABLE(1,2)
|
|
#else
|
|
# define NM_AVAILABLE_IN_1_2
|
|
#endif
|
|
|
|
#endif /* NM_VERSION_H */
|