about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2009-05-21 18:16:59 -0700
committerPetr Baudis <pasky@suse.cz>2009-05-22 05:04:09 +0200
commita1223d660444de94f267d77512ea1a93a2dd9a14 (patch)
treea3c82e208eeec16be21968d2e7fcb8fc677abb43
parent917dc587df5b051e5a13647f11e8ca824cb30cd7 (diff)
downloadglibc-a1223d660444de94f267d77512ea1a93a2dd9a14.tar.gz
glibc-a1223d660444de94f267d77512ea1a93a2dd9a14.tar.xz
glibc-a1223d660444de94f267d77512ea1a93a2dd9a14.zip
Remove __NR_accept4 definition.
This definition was meant to be removed before the checkin.  It was
used in the development.
(cherry picked from commit d14eda9310125ddf8fe66df01bbe46ab7d226a5e)
-rw-r--r--ChangeLog2
-rw-r--r--sysdeps/unix/sysv/linux/accept4.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 16f3e53c9a..dd4e6721b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-05-21  Jakub Jelinek  <jakub@redhat.com>
 
+	* sysdeps/unix/sysv/linux/accept4.c (__NR_accept4): Don't define.
+
 	* sysdeps/unix/sysv/linux/socketcall.h (SOCKOP_paccept): Remove.
 	(SOCKOP_accept4): Define.
 
diff --git a/sysdeps/unix/sysv/linux/accept4.c b/sysdeps/unix/sysv/linux/accept4.c
index 97f7b8ce62..4be710f76d 100644
--- a/sysdeps/unix/sysv/linux/accept4.c
+++ b/sysdeps/unix/sysv/linux/accept4.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2008, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2008.
 
@@ -24,8 +24,6 @@
 #include <sysdep-cancel.h>
 #include <sys/syscall.h>
 
-#define __NR_accept4                            288
-
 
 #ifdef __NR_accept4
 int