diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-09 22:52:54 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-10 09:08:23 +0200 |
commit | e599318e912d8836c59d8b5202e3e31a6b8dcae9 (patch) | |
tree | 1172b8b830a1c3236e45c834c2b80e01325ea144 /rtemsbsd/rtems/rtems-bsd-rwlock.c | |
parent | Move files to match FreeBSD layout (diff) | |
download | rtems-libbsd-e599318e912d8836c59d8b5202e3e31a6b8dcae9.tar.bz2 |
Update files to match FreeBSD layout
Add compatibility with Newlib header files. Some FreeBSD header files
are mapped by the translation script:
o rtems/bsd/sys/_types.h
o rtems/bsd/sys/errno.h
o rtems/bsd/sys/lock.h
o rtems/bsd/sys/param.h
o rtems/bsd/sys/resource.h
o rtems/bsd/sys/time.h
o rtems/bsd/sys/timespec.h
o rtems/bsd/sys/types.h
o rtems/bsd/sys/unistd.h
It is now possible to include <sys/socket.h> directly for example.
Generate one Makefile which builds everything including tests.
Diffstat (limited to 'rtemsbsd/rtems/rtems-bsd-rwlock.c')
-rw-r--r-- | rtemsbsd/rtems/rtems-bsd-rwlock.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/rtemsbsd/rtems/rtems-bsd-rwlock.c b/rtemsbsd/rtems/rtems-bsd-rwlock.c index a38a9a14..50e39997 100644 --- a/rtemsbsd/rtems/rtems-bsd-rwlock.c +++ b/rtemsbsd/rtems/rtems-bsd-rwlock.c @@ -37,19 +37,16 @@ * SUCH DAMAGE. */ -#include <pthread.h> - -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> #include <rtems/score/objectimpl.h> #include <rtems/posix/rwlockimpl.h> -#include <sys/types.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/types.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/rwlock.h> +#include <rtems/bsd/sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <sys/systm.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/rwlock.h> #ifndef INVARIANTS #define _rw_assert(rw, what, file, line) @@ -234,7 +231,7 @@ _rw_wlock(struct rwlock *rw, const char *file, int line) { int iret; - pthread_rwlock_wrlock( &rw->lock_object.lo_id ); + iret = pthread_rwlock_wrlock( &rw->lock_object.lo_id ); BSD_ASSERT( iret == 0 ); return 0; |