diff options
Diffstat (limited to 'src/glib_compat.h')
| -rw-r--r-- | src/glib_compat.h | 45 |
1 files changed, 3 insertions, 42 deletions
diff --git a/src/glib_compat.h b/src/glib_compat.h index 97d1fdc0c..5277d317e 100644 --- a/src/glib_compat.h +++ b/src/glib_compat.h @@ -28,53 +28,14 @@ #include <glib.h> -#if !GLIB_CHECK_VERSION(2,18,0) - -static inline void -g_set_error_literal(GError **err, GQuark domain, gint code, - const gchar *message) -{ - g_set_error(err, domain, code, "%s", message); -} - -#endif - #if !GLIB_CHECK_VERSION(2,28,0) +#include "system/clock.h" + static inline gint64 g_source_get_time(GSource *source) { - GTimeVal tv; - g_source_get_current_time(source, &tv); - return tv.tv_sec * 1000000 + tv.tv_usec; -} - -#endif - -#if defined(G_OS_WIN32) && defined(g_file_test) - -/* Modern GLib on Win32 likes to use UTF-8 for file names. -It redefines g_file_test() to be g_file_test_utf8(). -This gives incorrect results for non-ASCII files. -Old g_file_test() is available for *binary compatibility*, -but symbol is hidden from linker, we copy-paste its definition here */ - -#undef g_file_test - -static inline gboolean -g_file_test(const gchar *filename, GFileTest test) -{ - gchar *utf8_filename = g_locale_to_utf8(filename, -1, NULL, NULL, NULL); - gboolean retval; - - if (utf8_filename == NULL) - return FALSE; - - retval = g_file_test_utf8(utf8_filename, test); - - g_free(utf8_filename); - - return retval; + return monotonic_clock_us(); } #endif |