[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 32/36: Fix missing renames
From: |
Samuel Thibault |
Subject: |
[hurd] 32/36: Fix missing renames |
Date: |
Tue, 24 Sep 2013 12:31:19 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch upstream
in repository hurd.
commit 3aee8e4b88269ec6fbc47779cc2acb5cce6d78b4
Author: Samuel Thibault <address@hidden>
Date: Tue Sep 24 07:25:05 2013 +0200
Fix missing renames
* pflocal/sock.c (sock_connect, sock_shutdown): Rename SOCK_CONNECTED to
PFLOCAL_SOCK_CONNECTED.
---
pflocal/sock.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pflocal/sock.c b/pflocal/sock.c
index 442205a..2641e1c 100644
--- a/pflocal/sock.c
+++ b/pflocal/sock.c
@@ -402,7 +402,7 @@ sock_connect (struct sock *sock1, struct sock *sock2)
/* If SOCK1 == SOCK2, then we get a fifo! */
pthread_mutex_lock (&sock2->lock);
- if ((sock1->flags & PFLOCAL_SOCK_CONNECTED) || (sock2->flags &
SOCK_CONNECTED))
+ if ((sock1->flags & PFLOCAL_SOCK_CONNECTED) || (sock2->flags &
PFLOCAL_SOCK_CONNECTED))
/* An already-connected socket. */
err = EISCONN;
else
@@ -455,13 +455,13 @@ sock_shutdown (struct sock *sock, unsigned flags)
old_flags = sock->flags;
sock->flags |= flags;
- if (flags & PFLOCAL_SOCK_SHUTDOWN_READ && !(old_flags & SOCK_SHUTDOWN_READ))
+ if (flags & PFLOCAL_SOCK_SHUTDOWN_READ && !(old_flags &
PFLOCAL_SOCK_SHUTDOWN_READ))
{
/* Shutdown the read half. */
read_pipe = sock->read_pipe;
sock->read_pipe = NULL;
}
- if (flags & PFLOCAL_SOCK_SHUTDOWN_WRITE && !(old_flags &
SOCK_SHUTDOWN_WRITE))
+ if (flags & PFLOCAL_SOCK_SHUTDOWN_WRITE && !(old_flags &
PFLOCAL_SOCK_SHUTDOWN_WRITE))
{
/* Shutdown the write half. */
write_pipe = sock->write_pipe;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] 13/36: Fix S_tioctl_tiocsetd returning errors, (continued)
- [hurd] 13/36: Fix S_tioctl_tiocsetd returning errors, Samuel Thibault, 2013/09/24
- [hurd] 11/36: Fix gcc warning, Samuel Thibault, 2013/09/24
- [hurd] 14/36: Fix gcc warning, Samuel Thibault, 2013/09/24
- [hurd] 25/36: Fix gcc warning, Samuel Thibault, 2013/09/24
- [hurd] 08/36: Fix ENOMEM handling in *_make_peropen, Samuel Thibault, 2013/09/24
- [hurd] 31/36: Merge remote-tracking branch 'upstream/master' into upstream, Samuel Thibault, 2013/09/24
- [hurd] 07/36: Fix gcc warning:, Samuel Thibault, 2013/09/24
- [hurd] 35/36: Merge remote-tracking branch 'upstream/master' into upstream, Samuel Thibault, 2013/09/24
- [hurd] 34/36: Drop dead links, Samuel Thibault, 2013/09/24
- [hurd] 16/36: Fix gcc warning, Samuel Thibault, 2013/09/24
- [hurd] 32/36: Fix missing renames,
Samuel Thibault <=
- [hurd] 29/36: Fix spurious port deallocation, Samuel Thibault, 2013/09/24
- [hurd] 30/36: Add --without-daemon option to configure, Samuel Thibault, 2013/09/24
- [hurd] 36/36: Merge branch 'upstream' of git.debian.org:/git/pkg-hurd/hurd into upstream, Samuel Thibault, 2013/09/24
- [hurd] 12/36: Fix test for term open mode, Samuel Thibault, 2013/09/24
- [hurd] 28/36: include: make /hurd/proc PID 3, Samuel Thibault, 2013/09/24
- [hurd] 26/36: Fix sscanf format for c99, Samuel Thibault, 2013/09/24
- [hurd] 27/36: proc: do not hand out PID 0, Samuel Thibault, 2013/09/24
- [hurd] 33/36: Merge remote-tracking branch 'upstream/master' into upstream, Samuel Thibault, 2013/09/24
- [hurd] 21/36: Fix gcc warning, Samuel Thibault, 2013/09/24
- [hurd] 17/36: Fix test for block compression, Samuel Thibault, 2013/09/24