diff --git a/.pick_status.json b/.pick_status.json index cb50a26ae54..4f697626e3d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -34,7 +34,7 @@ "description": "zink: put sysmacros.h include under #ifdef MAJOR_IN_SYSMACROS", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6d60115be7cce87402f15ba01d81783dbf25f80a", "notes": null diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index f42f340657b..97af50f68c0 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -55,8 +55,13 @@ #include #include #include +#ifdef MAJOR_IN_MKDEV +#include +#endif +#ifdef MAJOR_IN_SYSMACROS #include #endif +#endif static int num_screens = 0; bool zink_tracing = false;