* include/features.h (__GLIBC_MINOR__): It's glibc 2.5 now.

2006-10-06  Ulrich Drepper  <drepper@redhat.com>

	* po/pl.po: Update from translation team.

	* nscd/nscd.c (main): Fix typo in message.
	Patch by Jakub Bogsz <qboosh@pld-linux.org>.
This commit is contained in:
Ulrich Drepper 2006-10-06 15:39:29 +00:00
parent 2e4f1cfb1f
commit 3a4e060900
5 changed files with 19 additions and 7 deletions

View File

@ -1,3 +1,14 @@
2006-10-06 Andreas Jaeger <aj@suse.de>
* include/features.h (__GLIBC_MINOR__): It's glibc 2.5 now.
2006-10-06 Ulrich Drepper <drepper@redhat.com>
* po/pl.po: Update from translation team.
* nscd/nscd.c (main): Fix typo in message.
Patch by Jakub Bogsz <qboosh@pld-linux.org>.
2006-10-02 Jakub Jelinek <jakub@redhat.com>
[BZ #3291]

View File

@ -304,7 +304,7 @@
/* Major and minor version number of the GNU C library package. Use
these macros to test for features in specific releases. */
#define __GLIBC__ 2
#define __GLIBC_MINOR__ 4
#define __GLIBC_MINOR__ 5
#define __GLIBC_PREREQ(maj, min) \
((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))

View File

@ -1,7 +1,7 @@
comment_char %
escape_char /
%
% Tatar Language Locale for Tatarstan
% Tatar Language Locale for Russia
% Source:
% Contact: Pablo Saratxaga, Rinat Norkin
% Email: <pablo@mandrakesoft.com>, <rinat@taif.ru>
@ -24,7 +24,7 @@ escape_char /
% replace cyrillic alphabet
LC_IDENTIFICATION
title "Tatar language locale for Tatarstan"
title "Tatar language locale for Russia"
source "Rinat Norkin"
address ""
contact "Pablo Saratxaga, Rinat Norkin"
@ -32,7 +32,7 @@ email "pablo@mandrakesoft.com, rinat@taif.ru"
tel ""
fax ""
language "Tatar"
territory "Tatarstan"
territory "Russia"
revision "0.4"
date "2001-01-28"

View File

@ -2393,8 +2393,9 @@ This function is similar to @code{sprintf}, except that it dynamically
allocates a string (as with @code{malloc}; @pxref{Unconstrained
Allocation}) to hold the output, instead of putting the output in a
buffer you allocate in advance. The @var{ptr} argument should be the
address of a @code{char *} object, and @code{asprintf} stores a pointer
to the newly allocated string at that location.
address of a @code{char *} object, and a successful call to
@code{asprintf} stores a pointer to the newly allocated string at that
location.
The return value is the number of characters allocated for the buffer, or
less than zero if an error occurred. Usually this means that the buffer

View File

@ -237,7 +237,7 @@ main (int argc, char **argv)
if (chdir ("/") != 0)
error (EXIT_FAILURE, errno,
_("cannot change current working cirectory to \"/\""));
_("cannot change current working directory to \"/\""));
openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);