diff options
| author | Colin Walters <walters@verbum.org> | 2010-10-21 11:09:05 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-10-21 11:11:04 -0400 |
| commit | 63c1409c0ce6d6dbca5df0e9ace55511263d28a7 (patch) | |
| tree | d06911985384c0a21f7b10b006dbb6cc9a75f1ea | |
| parent | c68f9b3e0fcf6886acd7675331e96a0b85e2bb76 (diff) | |
| download | gjs-63c1409c0ce6d6dbca5df0e9ace55511263d28a7.tar.gz | |
Bump required glib to 2.18
The verison of g-i we require itself needs 2.24. Now, I'm not
actually going to claim we work with 2.18, but doing this allows me to
drop the glib stuff from compat.h at least.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gjs/compat.h | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 22bfad0d..59665617 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,7 @@ fi AM_CONDITIONAL([ENABLE_COVERAGE], [test x$enable_coverage = xyes]) # Checks for libraries. -m4_define(gobject_required_version, 2.16.0) +m4_define(gobject_required_version, 2.18.0) # Look for Spidermonkey. If js-config exists, use that; # otherwise we try some pkgconfig files from various distributions. diff --git a/gjs/compat.h b/gjs/compat.h index c634b06e..3976064b 100644 --- a/gjs/compat.h +++ b/gjs/compat.h @@ -24,18 +24,10 @@ #ifndef __GJS_COMPAT_H__ #define __GJS_COMPAT_H__ -#include <glib.h> - G_BEGIN_DECLS #include "config.h" -#if !GLIB_CHECK_VERSION(2, 18, 0) - -#define g_set_error_literal(error, domain, code, message) g_set_error(error, domain, code, "%s", message) -#define g_dpgettext2(domain, ctx, msgid) dgettext(domain, msgid) - -#endif /* See https://bugzilla.gnome.org/show_bug.cgi?id=622896 */ #ifndef HAVE_MOZJS_2 |