diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-09-14 16:00:45 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-10-10 07:54:14 +0200 |
| commit | a2a71b5900b94238d600ca097850e21cb45d1cf8 (patch) | |
| tree | 027546075f071f8f2b33da05fb663d61a9684209 /cpukit/libstdthreads | |
| parent | build: Merge librpc/Makefile.am (diff) | |
| download | rtems-a2a71b5900b94238d600ca097850e21cb45d1cf8.tar.bz2 | |
build: Merge libstdthreads/Makefile.am
Diffstat (limited to 'cpukit/libstdthreads')
| -rw-r--r-- | cpukit/libstdthreads/Makefile.am | 16 | ||||
| -rw-r--r-- | cpukit/libstdthreads/cnd.c | 4 | ||||
| -rw-r--r-- | cpukit/libstdthreads/mtx.c | 2 |
3 files changed, 3 insertions, 19 deletions
diff --git a/cpukit/libstdthreads/Makefile.am b/cpukit/libstdthreads/Makefile.am deleted file mode 100644 index 1cb1bf0381..0000000000 --- a/cpukit/libstdthreads/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -include $(top_srcdir)/automake/compile.am - -noinst_LIBRARIES = libstdthreads.a - -libstdthreads_a_CFLAGS = -std=c11 - -libstdthreads_a_SOURCES = -libstdthreads_a_SOURCES += call_once.c -libstdthreads_a_SOURCES += cnd.c -libstdthreads_a_SOURCES += mtx.c -if HAS_PTHREADS -libstdthreads_a_SOURCES += thrd.c -endif -libstdthreads_a_SOURCES += tss.c - -include $(top_srcdir)/automake/local.am diff --git a/cpukit/libstdthreads/cnd.c b/cpukit/libstdthreads/cnd.c index 7ed750aee4..ac7b0a6073 100644 --- a/cpukit/libstdthreads/cnd.c +++ b/cpukit/libstdthreads/cnd.c @@ -62,8 +62,8 @@ cnd_signal(cnd_t *cond) } int -cnd_timedwait(cnd_t *restrict cond, mtx_t *restrict mtx, - const struct timespec *restrict ts) +cnd_timedwait(cnd_t *__restrict cond, mtx_t *__restrict mtx, + const struct timespec *__restrict ts) { switch (_Condition_Wait_recursive_timed(cond, mtx, ts)) { diff --git a/cpukit/libstdthreads/mtx.c b/cpukit/libstdthreads/mtx.c index 48369c2ed0..27c6ee93c7 100644 --- a/cpukit/libstdthreads/mtx.c +++ b/cpukit/libstdthreads/mtx.c @@ -56,7 +56,7 @@ mtx_lock(mtx_t *mtx) } int -mtx_timedlock(mtx_t *restrict mtx, const struct timespec *restrict ts) +mtx_timedlock(mtx_t *__restrict mtx, const struct timespec *__restrict ts) { switch (_Mutex_recursive_Acquire_timed(mtx, ts)) { |