diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.in | 8 | ||||
| -rw-r--r-- | include/nm-glib-compat.h | 15 | ||||
| -rw-r--r-- | include/nm-version.h | 2 | ||||
| -rw-r--r-- | include/wireless-helper.h | 2 |
4 files changed, 15 insertions, 12 deletions
diff --git a/include/Makefile.in b/include/Makefile.in index fda755a2..27d7ad02 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -179,8 +179,16 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ +LIBNL1_CFLAGS = @LIBNL1_CFLAGS@ +LIBNL1_LIBS = @LIBNL1_LIBS@ +LIBNL2_CFLAGS = @LIBNL2_CFLAGS@ +LIBNL2_LIBS = @LIBNL2_LIBS@ +LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ +LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ LIBNL_LIBS = @LIBNL_LIBS@ +LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ +LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff --git a/include/nm-glib-compat.h b/include/nm-glib-compat.h index 9c1fe347..4b968710 100644 --- a/include/nm-glib-compat.h +++ b/include/nm-glib-compat.h @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2008 Red Hat, Inc. + * (C) Copyright 2008 - 2011 Red Hat, Inc. */ #ifndef NM_GLIB_COMPAT_H @@ -24,14 +24,9 @@ #include <glib.h> -#if !GLIB_CHECK_VERSION(2,14,0) - -#define g_timeout_add_seconds(i, f, d) \ - g_timeout_add (i * G_USEC_PER_SEC, f, d) - -#define g_timeout_add_seconds_full(p, i, f, d, n) \ - g_timeout_add_full (p, i * G_USEC_PER_SEC, f, d, n) - -#endif /* !GLIB_CHECK_VERSION(2,14,0) */ +#if !GLIB_CHECK_VERSION(2,31,0) +#define g_value_set_schar g_value_set_char +#define g_value_get_schar g_value_get_char +#endif #endif /* NM_GLIB_COMPAT_H */ diff --git a/include/nm-version.h b/include/nm-version.h index 3d3adfba..b893219d 100644 --- a/include/nm-version.h +++ b/include/nm-version.h @@ -43,7 +43,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (0) +#define NM_MICRO_VERSION (1) /** * NM_CHECK_VERSION: diff --git a/include/wireless-helper.h b/include/wireless-helper.h index d150ef7d..2e4509a8 100644 --- a/include/wireless-helper.h +++ b/include/wireless-helper.h @@ -27,6 +27,6 @@ #include <sys/types.h> #include <linux/types.h> #include <sys/socket.h> -#include <net/if.h> +#include <linux/if.h> #include <wireless.h> |