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/sock.h | |
parent | 59f09db0b59c710e65aa075874f9d53f29ee18cf (diff) |
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/sock.h')
-rw-r--r-- | pflocal/sock.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pflocal/sock.h b/pflocal/sock.h index fb2db5a4..5800420c 100644 --- a/pflocal/sock.h +++ b/pflocal/sock.h @@ -85,10 +85,10 @@ struct sock }; /* Socket flags */ -#define SOCK_CONNECTED 0x1 /* A connected connection-oriented sock. */ -#define SOCK_NONBLOCK 0x2 /* Don't block on I/O. */ -#define SOCK_SHUTDOWN_READ 0x4 /* The read-half has been shutdown. */ -#define SOCK_SHUTDOWN_WRITE 0x8 /* The write-half has been shutdown. */ +#define PFLOCAL_SOCK_CONNECTED 0x1 /* A connected connection-oriented sock. */ +#define PFLOCAL_SOCK_NONBLOCK 0x2 /* Don't block on I/O. */ +#define PFLOCAL_SOCK_SHUTDOWN_READ 0x4 /* The read-half has been shutdown. */ +#define PFLOCAL_SOCK_SHUTDOWN_WRITE 0x8 /* The write-half has been shutdown. */ /* Returns the pipe that SOCK is reading from in PIPE, locked and with an additional reference, or an error saying why it's not possible. NULL may @@ -143,7 +143,7 @@ error_t sock_get_addr (struct sock *sock, struct addr **addr); error_t sock_get_write_addr_port (struct sock *sock, mach_port_t *addr_port); /* Shutdown either the read or write halves of SOCK, depending on whether the - SOCK_SHUTDOWN_READ or SOCK_SHUTDOWN_WRITE flags are set in FLAGS. */ + PFLOCAL_SOCK_SHUTDOWN_READ or PFLOCAL_SOCK_SHUTDOWN_WRITE flags are set in FLAGS. */ void sock_shutdown (struct sock *sock, unsigned flags); /* Return a new address, not connected to any socket yet, ADDR. */ |