[PATCH xserver 1/6] dix: Fix a warning about GetTimeInMillis return value in XFont2.
Eric Anholt
eric at anholt.net
Mon May 7 23:46:15 UTC 2018
Signed-off-by: Eric Anholt <eric at anholt.net>
---
dix/dixfonts.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index cca92ed2791c..0ea8678bbe03 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -2015,6 +2015,11 @@ _remove_fs_handlers(FontPathElementPtr fpe, FontBlockHandlerProcPtr block_handle
RemoveFontWakeup(fpe);
}
+static uint32_t wrap_time_in_millis(void)
+{
+ return GetTimeInMillis();
+}
+
static const xfont2_client_funcs_rec xfont2_client_funcs = {
.version = XFONT2_CLIENT_FUNCS_VERSION,
.client_auth_generation = _client_auth_generation,
@@ -2025,7 +2030,7 @@ static const xfont2_client_funcs_rec xfont2_client_funcs = {
.get_client_resolutions = get_client_resolutions,
.get_default_point_size = get_default_point_size,
.get_new_font_client_id = get_new_font_client_id,
- .get_time_in_millis = GetTimeInMillis,
+ .get_time_in_millis = wrap_time_in_millis,
.init_fs_handlers = _init_fs_handlers,
.register_fpe_funcs = register_fpe_funcs,
.remove_fs_handlers = _remove_fs_handlers,
--
2.17.0
More information about the xorg-devel
mailing list