Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
src/util/glibcompat.c | 26 +++++++++++++-------------
src/util/glibcompat.h | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/util/glibcompat.c b/src/util/glibcompat.c
index 9fba54cb79..e19cf74e72 100644
--- a/src/util/glibcompat.c
+++ b/src/util/glibcompat.c
@@ -23,9 +23,21 @@
#include "glibcompat.h"
+#undef g_fsync
#undef g_strdup_printf
#undef g_strdup_vprintf
-#undef g_fsync
+
+
+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 +65,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
-}
diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h
index 7878ad24ed..ce31a4de04 100644
--- a/src/util/glibcompat.h
+++ b/src/util/glibcompat.h
@@ -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
--
2.24.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
