Changeset 2b3dd78 in mainline for uspace/lib/posix/src/pthread/condvar.c

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/lib/posix/src/pthread/condvar.c (moved) (moved from uspace/lib/posix/source/pthread/condvar.c ) (2 diffs)

uspace/lib/posix/src/pthread/condvar.c

@@ -33 +33 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "posix/pthread.h"
 #include "errno.h"
@@ -66 +63 @@
 
 int pthread_cond_timedwait(pthread_cond_t *restrict condvar,
-    pthread_mutex_t *restrict mutex, const struct __POSIX_DEF__(timespec) *restrict timeout)
+    pthread_mutex_t *restrict mutex, const struct timespec *restrict timeout)
 {
         not_implemented();