frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: Fix a warning about GetTimeInMillis return value in XFont2. 

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Eric Anholt 2018-05-07 16:46:15 -07:00 committed by Adam Jackson
parent cf838f5ca8
commit e1ccd0fa0e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dix/dixfonts.c
View File

@ -2015,6 +2015,11 @@ _remove_fs_handlers(FontPathElementPtr fpe, FontBlockHandlerProcPtr block_handle
RemoveFontWakeup(fpe); RemoveFontWakeup(fpe);
} }
static uint32_t wrap_time_in_millis(void)
{
return GetTimeInMillis();
}
static const xfont2_client_funcs_rec xfont2_client_funcs = { static const xfont2_client_funcs_rec xfont2_client_funcs = {
.version = XFONT2_CLIENT_FUNCS_VERSION, .version = XFONT2_CLIENT_FUNCS_VERSION,
.client_auth_generation = _client_auth_generation, .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_client_resolutions = get_client_resolutions,
.get_default_point_size = get_default_point_size, .get_default_point_size = get_default_point_size,
.get_new_font_client_id = get_new_font_client_id, .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, .init_fs_handlers = _init_fs_handlers,
.register_fpe_funcs = register_fpe_funcs, .register_fpe_funcs = register_fpe_funcs,
.remove_fs_handlers = _remove_fs_handlers, .remove_fs_handlers = _remove_fs_handlers,