diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /trans | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'trans')
| -rw-r--r-- | trans/Makefile | 1 | ||||
| -rw-r--r-- | trans/proxy-defpager.c | 1 | ||||
| -rw-r--r-- | trans/streamio.c | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/trans/Makefile b/trans/Makefile index 8eb6c78e..4e6a22dd 100644 --- a/trans/Makefile +++ b/trans/Makefile @@ -46,6 +46,7 @@ proxy-defpager crash password streamio: ../libthreads/libthreads.a ../libports/l fifo new-fifo: ../libpipe/libpipe.a fwd: ../libfshelp/libfshelp.a ../libports/libports.a hello-mt magic null ifsock fifo new-fifo firmlink: ../libtrivfs/libtrivfs.a ../libfshelp/libfshelp.a ../libthreads/libthreads.a ../libports/libports.a ../libihash/libihash.a +magic: ../libiohelp/libiohelp.a hello: ../libtrivfs/libtrivfs.a ../libfshelp/libfshelp.a ../libports/libports.a ../libihash/libihash.a fakeroot: ../libnetfs/libnetfs.a ../libfshelp/libfshelp.a ../libiohelp/libiohelp.a ../libthreads/libthreads.a ../libports/libports.a ../libihash/libihash.a $(targets): ../libshouldbeinlibc/libshouldbeinlibc.a diff --git a/trans/proxy-defpager.c b/trans/proxy-defpager.c index cda79592..0a5ab65e 100644 --- a/trans/proxy-defpager.c +++ b/trans/proxy-defpager.c @@ -107,7 +107,6 @@ S_default_pager_paging_storage (mach_port_t default_pager, kern_return_t S_default_pager_object_set_size (mach_port_t memory_object, - mach_port_t reply_port, mach_port_seqno_t seqno, vm_size_t object_size_limit) { diff --git a/trans/streamio.c b/trans/streamio.c index 0faa8a3e..c563c03c 100644 --- a/trans/streamio.c +++ b/trans/streamio.c @@ -554,8 +554,7 @@ trivfs_S_io_select (struct trivfs_protid *cred, if (!(cred->po->openmodes & O_WRITE) && (*type & SELECT_WRITE)) return EBADF; - if (*type & ~(SELECT_READ | SELECT_WRITE)) - return EINVAL; + *type &= SELECT_READ | SELECT_WRITE; if (*type == 0) return 0; |