diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-21 13:59:38 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-21 13:59:38 +0200 |
| commit | ac5d97ead2173f6ec6a8fc3f57b994c86c0afe27 (patch) | |
| tree | debba7630c16dc9580d294f355683ec42f398ffd /pflocal/io.c | |
| parent | 59f09db0b59c710e65aa075874f9d53f29ee18cf (diff) | |
| download | hurd-ac5d97ead2173f6ec6a8fc3f57b994c86c0afe27.tar.gz hurd-ac5d97ead2173f6ec6a8fc3f57b994c86c0afe27.tar.bz2 hurd-ac5d97ead2173f6ec6a8fc3f57b994c86c0afe27.zip | |
Rename SOCK_* into PFLOCAL_SOCK_*
To avoid conflicting with glibc's SOCK_*
* pflocal/io.c, pflocal/sock.c, pflocal/sock.h, pflocal/socket.c: Rename
SOCK_CONNECTED into PFLOCAL_SOCK_CONNECTED,
SOCK_NONBLOCK into PFLOCAL_SOCK_NONBLOCK,
SOCK_SHUTDOWN_READ into PFLOCAL_SOCK_SHUTDOWN_READ,
SOCK_SHUTDOWN_WRITE into PFLOCAL_SOCK_SHUTDOWN_WRITE.
Diffstat (limited to 'pflocal/io.c')
| -rw-r--r-- | pflocal/io.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pflocal/io.c b/pflocal/io.c index 67d0349e..00e859a4 100644 --- a/pflocal/io.c +++ b/pflocal/io.c @@ -63,7 +63,7 @@ S_io_read (struct sock_user *user, else if (!err) { err = - pipe_read (pipe, user->sock->flags & SOCK_NONBLOCK, NULL, + pipe_read (pipe, user->sock->flags & PFLOCAL_SOCK_NONBLOCK, NULL, data, data_len, amount); pipe_release_reader (pipe); } @@ -104,7 +104,7 @@ S_io_write (struct sock_user *user, if (!err) { - err = pipe_write (pipe, user->sock->flags & SOCK_NONBLOCK, + err = pipe_write (pipe, user->sock->flags & PFLOCAL_SOCK_NONBLOCK, source_addr, data, data_len, amount); if (err && source_addr) ports_port_deref (source_addr); @@ -365,9 +365,9 @@ S_io_get_openmodes (struct sock_user *user, int *bits) flags = user->sock->flags; *bits = O_APPEND /* pipes always append */ - | (flags & SOCK_NONBLOCK ? O_NONBLOCK : 0) - | (flags & SOCK_SHUTDOWN_READ ? 0 : O_READ) - | (flags & SOCK_SHUTDOWN_WRITE ? 0 : O_WRITE); + | (flags & PFLOCAL_SOCK_NONBLOCK ? O_NONBLOCK : 0) + | (flags & PFLOCAL_SOCK_SHUTDOWN_READ ? 0 : O_READ) + | (flags & PFLOCAL_SOCK_SHUTDOWN_WRITE ? 0 : O_WRITE); return 0; } @@ -379,9 +379,9 @@ S_io_set_all_openmodes (struct sock_user *user, int bits) pthread_mutex_lock (&user->sock->lock); if (bits & O_NONBLOCK) - user->sock->flags |= SOCK_NONBLOCK; + user->sock->flags |= PFLOCAL_SOCK_NONBLOCK; else - user->sock->flags &= ~SOCK_NONBLOCK; + user->sock->flags &= ~PFLOCAL_SOCK_NONBLOCK; pthread_mutex_unlock (&user->sock->lock); return 0; @@ -395,7 +395,7 @@ S_io_set_some_openmodes (struct sock_user *user, int bits) pthread_mutex_lock (&user->sock->lock); if (bits & O_NONBLOCK) - user->sock->flags |= SOCK_NONBLOCK; + user->sock->flags |= PFLOCAL_SOCK_NONBLOCK; pthread_mutex_unlock (&user->sock->lock); return 0; @@ -409,7 +409,7 @@ S_io_clear_some_openmodes (struct sock_user *user, int bits) pthread_mutex_lock (&user->sock->lock); if (bits & O_NONBLOCK) - user->sock->flags &= ~SOCK_NONBLOCK; + user->sock->flags &= ~PFLOCAL_SOCK_NONBLOCK; pthread_mutex_unlock (&user->sock->lock); return 0; |