diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-20 11:17:57 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-20 12:30:51 +0200 |
| commit | 67d56a5cba4fdac8205a84bc4e3ca74d5efbb64c (patch) | |
| tree | fb1f7b4d96024147901dd84597c781d3355107a7 | |
| parent | 5ed697cda35fe300d2cb828370aaee489a0f9317 (diff) | |
Avoid conflicting declaration for egl typedefs
The EGL typedefs may have alternative declaration on some platforms,
such as NVIDIA, which cause build errors. Add guards around the
typedefs to avoid re-declaration.
Task-number: QTBUG-79709
Change-Id: I14f09c94e159ef51dd858f0877fe610ce6f582d4
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| -rw-r--r-- | src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h index 02b5b6f88..56a710c3d 100644 --- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h +++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h @@ -59,8 +59,10 @@ #endif // Copied from eglmesaext.h +#ifndef EGL_WL_bind_wayland_display typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display); typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display); +#endif QT_BEGIN_NAMESPACE |