提交 b14ad267 编写于 作者: D Daniel P. Berrangé

util: keep glib compat methods in alphabetical order

Reviewed-by: NPavel Hrdina <phrdina@redhat.com>
Reviewed-by: NDaniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 14c13644
......@@ -23,9 +23,22 @@
#include "glibcompat.h"
#undef g_fsync
#undef g_strdup_printf
#undef g_strdup_vprintf
#undef g_fsync
/* Drop when min glib >= 2.63.0 */
gint
vir_g_fsync(gint fd)
{
#ifdef G_OS_WIN32
return _commit(fd);
#else
return fsync(fd);
#endif
}
/* Due to a bug in glib, g_strdup_printf() nor g_strdup_vprintf()
* abort on OOM. It's fixed in glib's upstream. Provide our own
......@@ -53,15 +66,3 @@ vir_g_strdup_vprintf(const char *msg, va_list args)
abort();
return ret;
}
/* Drop when min glib >= 2.63.0 */
gint
vir_g_fsync(gint fd)
{
#ifdef G_OS_WIN32
return _commit(fd);
#else
return fsync(fd);
#endif
}
......@@ -21,11 +21,11 @@
#include <glib.h>
#include <glib/gstdio.h>
gint vir_g_fsync(gint fd);
char *vir_g_strdup_printf(const char *msg, ...)
G_GNUC_PRINTF(1, 2);
char *vir_g_strdup_vprintf(const char *msg, va_list args)
G_GNUC_PRINTF(1, 0);
gint vir_g_fsync(gint fd);
#if !GLIB_CHECK_VERSION(2, 64, 0)
# define g_strdup_printf vir_g_strdup_printf
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册