Skip to content

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

Open
sunweaver wants to merge 1 commit into
ArcticaProject:3.6.xfrom
sunweaver:pr/get-time-in-millis-on-32bit-archs
Open

dix: Fix a warning about GetTimeInMillis return value in XFont2.#1087
sunweaver wants to merge 1 commit into
ArcticaProject:3.6.xfrom
sunweaver:pr/get-time-in-millis-on-32bit-archs

Conversation

@sunweaver

Copy link
Copy Markdown
Member

Ported over from XOrg Server:

commit e1ccd0fa0e1081edf8a2c69ce6e8e3f67a4aecba
Author: Emma Anholt <emma@anholt.net>
Date:   Mon May 7 16:46:15 2018 -0700

    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 resolves the following issue when built with GCC-14 (and beyond):

../../dix/dixfonts.c: At top level:
../../dix/dixfonts.c:2485:27: error: initialization of âuint32_t (*)(void)â {aka âunsigned int (*)(void)â} from incompatible pointer type âCARD32 (*)(void)â {aka âlong unsigned int (*)(void)â} [-Wincompatible-pointer-types]
 2485 |     .get_time_in_millis = GetTimeInMillis,
      |

Ported over from XOrg Server:

    commit e1ccd0fa0e1081edf8a2c69ce6e8e3f67a4aecba
    Author: Emma Anholt <emma@anholt.net>
    Date:   Mon May 7 16:46:15 2018 -0700

        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 resolves the following issue when built with GCC-14 (and beyond):

    ../../dix/dixfonts.c: At top level:
    ../../dix/dixfonts.c:2485:27: error: initialization of âuint32_t (*)(void)â {aka âunsigned int (*)(void)â} from incompatible pointer type âCARD32 (*)(void)â {aka âlong unsigned int (*)(void)â} [-Wincompatible-pointer-types]
     2485 |     .get_time_in_millis = GetTimeInMillis,
          |
@sunweaver
sunweaver requested a review from uli42 January 15, 2025 22:05
@sunweaver

Copy link
Copy Markdown
Member Author

@uli42 uli42 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants