Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 1 commit into
base: 3.6.x
Choose a base branch
from

Conversation

sunweaver
Copy link
Member

Ported over from XOrg Server:

commit e1ccd0fa0e1081edf8a2c69ce6e8e3f67a4aecba
Author: Emma Anholt <[email protected]>
Date:   Mon May 7 16:46:15 2018 -0700

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

    Signed-off-by: Eric Anholt <[email protected]>
    Reviewed-by: Adam Jackson <[email protected]>

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 <[email protected]>
    Date:   Mon May 7 16:46:15 2018 -0700

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

        Signed-off-by: Eric Anholt <[email protected]>
        Reviewed-by: Adam Jackson <[email protected]>

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
Member Author

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.

1 participant