[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r7045 - in /fsf/trunk/libc: ChangeLog NEWS po/sv.po socket/Makefile socket/Versions socket/sys/socket.h
- To: commits@xxxxxxxxxx
- Subject: [commits] r7045 - in /fsf/trunk/libc: ChangeLog NEWS po/sv.po socket/Makefile socket/Versions socket/sys/socket.h
- From: eglibc@xxxxxxxxxx
- Date: Tue, 30 Sep 2008 07:03:09 -0000
Author: eglibc
Date: Tue Sep 30 00:03:08 2008
New Revision: 7045
Log:
Import glibc-mainline for 2008-09-30
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/NEWS
fsf/trunk/libc/po/sv.po
fsf/trunk/libc/socket/Makefile
fsf/trunk/libc/socket/Versions
fsf/trunk/libc/socket/sys/socket.h
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Sep 30 00:03:08 2008
@@ -1,3 +1,11 @@
+2008-09-29 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * socket/Versions: Remove paccept export for GLIBC_2.9.
+ * socket/Makefile (routines): Remove paccept.
+ * socket/sys/socket.h: Remove paccept declaration.
+
+ * po/sv.po: Update from translation team.
+
2008-09-22 Deborah S. Townsend <dstownse@xxxxxxxxxx>
* sysdeps/s390/s390-64/s390x-mcount.S: Replace ahi with aghi.
Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Tue Sep 30 00:03:08 2008
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes. 2008-9-16
+GNU C Library NEWS -- history of user-visible changes. 2008-9-29
Copyright (C) 1992-2007, 2008 Free Software Foundation, Inc.
See the end for copying conditions.
@@ -23,7 +23,7 @@
* New implementation of memmem, strstr, and strcasestr which is O(n).
Implemented by Eric Blake.
-* New Linux interfaces: inotify_init1, paccept, dup3, epoll_create1, pipe2
+* New Linux interfaces: inotify_init1, dup3, epoll_create1, pipe2
* Implement "e" option for popen to open file descriptor with the
close-on-exec flag set. Implemented by Ulrich Drepper.
Modified: fsf/trunk/libc/po/sv.po
==============================================================================
--- fsf/trunk/libc/po/sv.po (original)
+++ fsf/trunk/libc/po/sv.po Tue Sep 30 00:03:08 2008
@@ -1,13 +1,14 @@
# GNU libc message catalog for swedish
-# Copyright © 1996, 1998, 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
-# Jan Djärv <jan.h.d@xxxxxxxxxx>, 1996, 1998, 2001, 2002, 2003, 2006, 2007.
-# Revision: 1.57
+# Copyright © 1996, 1998, 2001, 2002, 2003, 2006, 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the glibc package.
+# Jan Djärv <jan.h.d@xxxxxxxxxx>, 1996, 1998, 2001, 2002, 2003, 2006, 2007, 2008
+# Revision: 1.59
#
msgid ""
msgstr ""
"Project-Id-Version: libc 2.7\n"
"POT-Creation-Date: 2007-10-15 21:18-0700\n"
-"PO-Revision-Date: 2007-11-14 21:01+0100\n"
+"PO-Revision-Date: 2008-09-29 07:26+0200\n"
"Last-Translator: Jan Djärv <jan.h.d@xxxxxxxxxx>\n"
"Language-Team: Swedish <tp-sv@xxxxxxxxxxxxxxx>\n"
"MIME-Version: 1.0\n"
@@ -2853,7 +2854,7 @@
"\n"
" -?,--help Visa denna hjälptext och avsluta\n"
" --usage Visa en kort hjälptext\n"
-" -V,--version Visa versionsinformation och avluta\n"
+" -V,--version Visa versionsinformation och avsluta\n"
"\n"
" Följande flaggor gäller bara när grafik genereras:\n"
" -t,--time-based Gör grafen linjär i tiden\n"
@@ -4328,59 +4329,59 @@
#: posix/getopt.c:571 posix/getopt.c:587
#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: flaggan \"%s\" är tvetydig\n"
#: posix/getopt.c:620 posix/getopt.c:624
#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: flaggan \"--%s\" tar inget argument\n"
#: posix/getopt.c:633 posix/getopt.c:638
#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: flaggan \"%c%s\" tar inget argument\n"
#: posix/getopt.c:681 posix/getopt.c:700 posix/getopt.c:1016
#: posix/getopt.c:1035
#, c-format
-msgid "%s: option '%s' requires an argument\n"
+msgid "%s: option `%s' requires an argument\n"
msgstr "%s: flaggan \"%s\" behöver ett argument\n"
#: posix/getopt.c:738 posix/getopt.c:741
#, c-format
-msgid "%s: unrecognized option '--%s'\n"
+msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: okänd flagga \"--%s\"\n"
#: posix/getopt.c:749 posix/getopt.c:752
#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: okänd flagga \"%c%s\"\n"
#: posix/getopt.c:804 posix/getopt.c:807
#, c-format
-msgid "%s: illegal option -- '%c'\n"
+msgid "%s: illegal option -- %c\n"
msgstr "%s: otillåten flagga -- %c\n"
#: posix/getopt.c:813 posix/getopt.c:816
#, c-format
-msgid "%s: invalid option -- '%c'\n"
+msgid "%s: invalid option -- %c\n"
msgstr "%s: ogiltig flagga -- %c\n"
#: posix/getopt.c:868 posix/getopt.c:884 posix/getopt.c:1088
#: posix/getopt.c:1106
#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+msgid "%s: option requires an argument -- %c\n"
msgstr "%s: flaggan behöver ett argument -- %c\n"
#: posix/getopt.c:937 posix/getopt.c:953
#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
#: posix/getopt.c:977 posix/getopt.c:995
#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
#: posix/regcomp.c:135
Modified: fsf/trunk/libc/socket/Makefile
==============================================================================
--- fsf/trunk/libc/socket/Makefile (original)
+++ fsf/trunk/libc/socket/Makefile Tue Sep 30 00:03:08 2008
@@ -27,7 +27,7 @@
routines := accept bind connect getpeername getsockname getsockopt \
listen recv recvfrom recvmsg send sendmsg sendto \
setsockopt shutdown socket socketpair isfdtype opensock \
- sockatmark paccept
+ sockatmark
aux := have_sock_cloexec
Modified: fsf/trunk/libc/socket/Versions
==============================================================================
--- fsf/trunk/libc/socket/Versions (original)
+++ fsf/trunk/libc/socket/Versions Tue Sep 30 00:03:08 2008
@@ -31,7 +31,4 @@
# Addition from P1003.1-200x
sockatmark;
}
- GLIBC_2.9 {
- paccept;
- }
}
Modified: fsf/trunk/libc/socket/sys/socket.h
==============================================================================
--- fsf/trunk/libc/socket/sys/socket.h (original)
+++ fsf/trunk/libc/socket/sys/socket.h Tue Sep 30 00:03:08 2008
@@ -214,18 +214,6 @@
extern int accept (int __fd, __SOCKADDR_ARG __addr,
socklen_t *__restrict __addr_len);
-#ifdef __USE_GNU
-/* Variant of the accept function which takes additional parameters. The
- MASK parameter allows to change the thread signal mask for the duration
- of the call. The FLAGS parameter allows to pass additional flags.
-
- This function is a cancellation point and therefore not marked with
- __THROW. */
-extern int paccept (int __fd, __SOCKADDR_ARG __addr,
- socklen_t *__restrict __addr_len,
- __const __sigset_t *__restrict __ss, int __flags);
-#endif
-
/* Shut down all or part of the connection open on socket FD.
HOW determines what to shut down:
SHUT_RD = No more receptions;