diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-10-06 13:21:31 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-10-06 14:08:17 +0200 |
| commit | 4d9bb9d9be5984459454c67f4ef7cf585370f9f3 (patch) | |
| tree | 17bf8926ae4f5b6b4b85468f333b3f53abf59df1 /recipes/trdx-nv-binaries | |
| parent | d8e8230f7e945b5eeb903aee2db721dd71cc219f (diff) | |
trdx-nv-binaries: don't include X11 headers in eglplatform.h
Qt5 uses tokens which would be renamed through defines in the X11 headers.
So don't inject these defines into Qt5 sources through eglplatform.h.
gcc 4.8 is more strict on type mismatch in assignments, so use correct
variable type for the EGLNativeDisplayType pointer.
Diffstat (limited to 'recipes/trdx-nv-binaries')
| -rw-r--r-- | recipes/trdx-nv-binaries/files/eglplatform.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/recipes/trdx-nv-binaries/files/eglplatform.h b/recipes/trdx-nv-binaries/files/eglplatform.h index 628968e..a141762 100644 --- a/recipes/trdx-nv-binaries/files/eglplatform.h +++ b/recipes/trdx-nv-binaries/files/eglplatform.h @@ -106,9 +106,10 @@ typedef void *EGLNativeDisplayType; #elif defined(__unix__) +/* don't include the X headers here, some define clash with Qt5 symbols */ #if 1 -typedef void *EGLNativeDisplayType; +typedef struct _XDisplay *EGLNativeDisplayType; typedef khronos_uint32_t EGLNativePixmapType; typedef khronos_uint32_t EGLNativeWindowType; |