OSDN Git Service

glx: Fix compilation with GLX_USE_WINDOWSGL
authorJon Turney <jon.turney@dronecode.org.uk>
Fri, 14 Dec 2018 13:20:10 +0000 (13:20 +0000)
committerJon Turney <jon.turney@dronecode.org.uk>
Sat, 15 Dec 2018 13:49:24 +0000 (13:49 +0000)
commitd512b35b62ff928b880a67887d36f1568aaa5e4b
tree5e8eac1526f684da75d6bf6cb2a1e47d52ab2129
parent29927e7524b07d491c555b8ed06c9b89cd0856f8
glx: Fix compilation with GLX_USE_WINDOWSGL

Sadly, the GLX_USE_APPLEGL and GLX_USE_WINDOWSGL cases are not identical
(because GLX_USE_WINDOWSGL uses vtables rather than a maze of ifdefs)

Include <sys/time.h> again, as functions prototyped by it are used in
the GLX_USE_WINDOWSGL path.

Make the include guard around the __glxGetMscRate() definition match the
one at it's declaration again, as it's referenced from dri_common.c
which is built for GLX_USE_WINDOWSGL.

Fixes: a95ec138 ("glx: mandate xf86vidmode only for "drm" dri platforms")
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
src/glx/glxcmds.c