|
@@ -19,12 +19,12 @@
|
|
|
/* Ask for warnings for anything that was marked deprecated in
|
|
|
* the defined version, or before. It is a candidate for rewrite.
|
|
|
*/
|
|
|
-#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_56
|
|
|
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_66
|
|
|
|
|
|
/* Ask for warnings if code tries to use function that did not
|
|
|
* exist in the defined version. These risk breaking builds
|
|
|
*/
|
|
|
-#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_56
|
|
|
+#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_66
|
|
|
|
|
|
#pragma GCC diagnostic push
|
|
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
|
@@ -105,29 +105,6 @@ static inline gpointer g_memdup2_qemu(gconstpointer mem, gsize byte_size)
|
|
|
}
|
|
|
#define g_memdup2(m, s) g_memdup2_qemu(m, s)
|
|
|
|
|
|
-#if defined(G_OS_UNIX)
|
|
|
-/*
|
|
|
- * Note: The fallback implementation is not MT-safe, and it returns a copy of
|
|
|
- * the libc passwd (must be g_free() after use) but not the content. Because of
|
|
|
- * these important differences the caller must be aware of, it's not #define for
|
|
|
- * GLib API substitution.
|
|
|
- */
|
|
|
-static inline struct passwd *
|
|
|
-g_unix_get_passwd_entry_qemu(const gchar *user_name, GError **error)
|
|
|
-{
|
|
|
-#if GLIB_CHECK_VERSION(2, 64, 0)
|
|
|
- return g_unix_get_passwd_entry(user_name, error);
|
|
|
-#else
|
|
|
- struct passwd *p = getpwnam(user_name);
|
|
|
- if (!p) {
|
|
|
- g_set_error_literal(error, G_UNIX_ERROR, 0, g_strerror(errno));
|
|
|
- return NULL;
|
|
|
- }
|
|
|
- return (struct passwd *)g_memdup(p, sizeof(*p));
|
|
|
-#endif
|
|
|
-}
|
|
|
-#endif /* G_OS_UNIX */
|
|
|
-
|
|
|
static inline bool
|
|
|
qemu_g_test_slow(void)
|
|
|
{
|