diff options
| author | Eric Anholt <eric@anholt.net> | 2018-05-07 16:46:18 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-05-08 11:59:36 -0400 |
| commit | 4c754b01fafc4b042d9918c05a71157f6fa6392a (patch) | |
| tree | d89e41eda369a1d1c3ff044bff0a78ab89461f21 /dri3 | |
| parent | 5e86484a183f051d7a8a67ea13c23a3d6e69e76b (diff) | |
dri3: Switch get_modifiers to using stdint.
We were mixing stdint and CARD* types, causing compiler warnings on
32-bit. Just switch over to stdint, which is what we'd like the server
to be using long term, anyway.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'dri3')
| -rw-r--r-- | dri3/dri3.h | 6 | ||||
| -rw-r--r-- | dri3/dri3_screen.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dri3/dri3.h b/dri3/dri3.h index db3f9cd23..30433dc4f 100644 --- a/dri3/dri3.h +++ b/dri3/dri3.h @@ -75,9 +75,9 @@ typedef int (*dri3_get_formats_proc) (ScreenPtr screen, CARD32 **formats); typedef int (*dri3_get_modifiers_proc) (ScreenPtr screen, - CARD32 format, - CARD32 *num_modifiers, - CARD64 **modifiers); + uint32_t format, + uint32_t *num_modifiers, + uint64_t **modifiers); typedef int (*dri3_get_drawable_modifiers_proc) (DrawablePtr draw, uint32_t format, diff --git a/dri3/dri3_screen.c b/dri3/dri3_screen.c index 80db96130..a900f261d 100644 --- a/dri3/dri3_screen.c +++ b/dri3/dri3_screen.c @@ -160,8 +160,8 @@ cache_formats_and_modifiers(ScreenPtr screen) const dri3_screen_info_rec *info = ds->info; CARD32 num_formats; CARD32 *formats; - CARD32 num_modifiers; - CARD64 *modifiers; + uint32_t num_modifiers; + uint64_t *modifiers; int i; if (ds->formats_cached) |