diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2023-12-29 17:52:31 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2023-12-31 01:44:38 -0500 |
| commit | 1b1ed5c82ffc1bbfa7df600459b247d23980e193 (patch) | |
| tree | b3dba827331b34e29e116d2364dd7a82316d4df2 | |
| parent | 97965dfea54b95e258f8b9b97a5871f9c1e8d959 (diff) | |
| download | newlib-1b1ed5c82ffc1bbfa7df600459b247d23980e193.zip newlib-1b1ed5c82ffc1bbfa7df600459b247d23980e193.tar.gz newlib-1b1ed5c82ffc1bbfa7df600459b247d23980e193.tar.bz2 | |
libgloss: sparc_leon: workaround newer newlib pthread APIs
Fix a compile error due to duplicate pthreads types:
.../libgloss/sparc_leon/mutex.c:50:8: error: conflicting types for ‘pthread_mutex_t’; have ‘struct pthread_mutex’
50 | } pthread_mutex_t;
In file included from .../newlib/libc/include/sys/types.h:221,
from .../libgloss/sparc_leon/mutex.c:26:
.../newlib/libc/include/sys/_pthreadtypes.h:154:20: note: previous declaration of ‘pthread_mutex_t’ with type ‘pthread_mutex_t’ {aka ‘long unsigned int’}
154 | typedef __uint32_t pthread_mutex_t; /* identify a mutex */
.../libgloss/sparc_leon/mutex.c:57:8: error: conflicting types for ‘pthread_mutexattr_t’; have ‘struct <anonymous>’
57 | } pthread_mutexattr_t;
../newlib/libc/include/sys/_pthreadtypes.h:169:3: note: previous declaration of ‘pthread_mutexattr_t’ with type ‘pthread_mutexattr_t’
169 | } pthread_mutexattr_t;
| -rw-r--r-- | libgloss/sparc_leon/mutex.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libgloss/sparc_leon/mutex.c b/libgloss/sparc_leon/mutex.c index eb2c299..3f51fea 100644 --- a/libgloss/sparc_leon/mutex.c +++ b/libgloss/sparc_leon/mutex.c @@ -23,9 +23,13 @@ */ +#define pthread_mutex_t pthread_mutex_t_ +#define pthread_mutexattr_t pthread_mutexattr_t_ #include <sys/types.h> #include <sys/lock.h> #include <asm-leon/queue.h> +#undef pthread_mutex_t +#undef pthread_mutexattr_t /*#include <sys/fsu_pthread_mutex.h>*/ typedef int pthread_protocol_t; |