diff options
| author | Michael Biebl <biebl@debian.org> | 2011-10-28 23:04:21 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-10-28 23:04:21 +0200 |
| commit | bc5840a47a748ffc2b6e7ec24c3dc5ba79664ca8 (patch) | |
| tree | bace204fa423c7489da190c08c2e86242c6b4588 /include/nm-glib-compat.h | |
| parent | 0ed641587611afffa0b2cd38d5c70bdb480fa241 (diff) | |
| parent | 485d149fe80915d94ed49ea6c2c0552cf7a3e79a (diff) | |
Merge commit 'upstream/0.9.1.95'
Diffstat (limited to 'include/nm-glib-compat.h')
| -rw-r--r-- | include/nm-glib-compat.h | 15 |
1 files changed, 5 insertions, 10 deletions
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 */ |