diff options
author | Tudor Florea <tudor.florea@enea.com> | 2014-10-10 03:19:58 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2014-10-10 03:19:58 +0200 |
commit | f98b448ee835646be48f530b3e6fe13b32b093f5 (patch) | |
tree | 9d1062f1e8893e72829df650f5e558c5fb255955 /recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch | |
download | meta-fsl-arm-f98b448ee835646be48f530b3e6fe13b32b093f5.tar.gz |
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch')
-rw-r--r-- | recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch new file mode 100644 index 0000000..3eac116 --- /dev/null +++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Avoid conflicting types with Xorg newer code | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
5 | |||
6 | Index: gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h | ||
7 | =================================================================== | ||
8 | --- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/HAL/gc_hal_base.h | ||
9 | +++ gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h | ||
10 | @@ -101,7 +101,7 @@ extern gcsPLS gcPLS; | ||
11 | typedef struct _gcsTLS * gcsTLS_PTR; | ||
12 | |||
13 | typedef void (* gctTLS_DESTRUCTOR) ( | ||
14 | - gcsTLS_PTR TLS | ||
15 | + gcsTLS_PTR pTLS | ||
16 | ); | ||
17 | |||
18 | typedef struct _gcsTLS | ||
19 | @@ -648,10 +648,10 @@ gcoOS_SetPLSValue( | ||
20 | /* Get access to the thread local storage. */ | ||
21 | gceSTATUS | ||
22 | gcoOS_GetTLS( | ||
23 | - OUT gcsTLS_PTR * TLS | ||
24 | + OUT gcsTLS_PTR * pTLS | ||
25 | ); | ||
26 | |||
27 | - /* Copy the TLS from a source thread. */ | ||
28 | + /* Copy the pTLS from a source thread. */ | ||
29 | gceSTATUS gcoOS_CopyTLS(IN gcsTLS_PTR Source); | ||
30 | |||
31 | /* Destroy the objects associated with the current thread. */ | ||