aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libio/stdio.h5
-rw-r--r--locale/locale.h6
-rw-r--r--localedata/ChangeLog3
-rw-r--r--localedata/locales/pl_PL10
-rw-r--r--setjmp/setjmp.h12
-rw-r--r--sysdeps/posix/euidaccess.c10
-rw-r--r--wcsmbs/wchar.h2
7 files changed, 28 insertions, 20 deletions
diff --git a/libio/stdio.h b/libio/stdio.h
index 3738e6d3b6..8e6694a6b3 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -1,5 +1,5 @@
/* Define ISO C stdio on top of C++ iostreams.
- Copyright (C) 1991,1994-2004,2005,2006 Free Software Foundation, Inc.
+ Copyright (C) 1991,1994-2004,2005,2006,2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -41,6 +41,9 @@ __BEGIN_DECLS
#if !defined __FILE_defined && defined __need_FILE
+/* Define outside of namespace so the C++ is happy. */
+struct _IO_FILE;
+
__BEGIN_NAMESPACE_STD
/* The opaque type of streams. This is the definition used elsewhere. */
typedef struct _IO_FILE FILE;
diff --git a/locale/locale.h b/locale/locale.h
index 1b0296ae4a..08fc531d7e 100644
--- a/locale/locale.h
+++ b/locale/locale.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,95-99,2000,01,02 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1995-2002,2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -48,6 +48,8 @@ __BEGIN_DECLS
#define LC_IDENTIFICATION __LC_IDENTIFICATION
+__BEGIN_NAMESPACE_STD
+
/* Structure giving information about numeric and monetary notation. */
struct lconv
{
@@ -119,8 +121,6 @@ struct lconv
};
-__BEGIN_NAMESPACE_STD
-
/* Set and/or return the current locale. */
extern char *setlocale (int __category, __const char *__locale) __THROW;
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 746ece1697..34262dcb31 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,8 @@
2007-02-17 Ulrich Drepper <drepper@redhat.com>
+ [BZ #2648]
+ * locales/pl_PL: Fix currency_symbol and its placement.
+
[BZ #3363]
* SUPPORTED (SUPPORTED-LOCALES): Add tt_RU@iqtelif.
* locales/tt_RU@iqtelif: New file.
diff --git a/localedata/locales/pl_PL b/localedata/locales/pl_PL
index 1b86b2960b..498fa511b8 100644
--- a/localedata/locales/pl_PL
+++ b/localedata/locales/pl_PL
@@ -2127,7 +2127,7 @@ END LC_MESSAGES
LC_MONETARY
int_curr_symbol "<U0050><U004C><U004E><U0020>"
-currency_symbol "<U005A><U0142>"
+currency_symbol "<U007A><U0142>"
mon_decimal_point "<U002C>"
mon_thousands_sep "<U002E>"
mon_grouping 3;3
@@ -2135,10 +2135,10 @@ positive_sign ""
negative_sign "<U002D>"
int_frac_digits 2
frac_digits 2
-p_cs_precedes 1
-p_sep_by_space 0
-n_cs_precedes 1
-n_sep_by_space 0
+p_cs_precedes 0
+p_sep_by_space 1
+n_cs_precedes 0
+n_sep_by_space 1
p_sign_posn 1
n_sign_posn 1
END LC_MONETARY
diff --git a/setjmp/setjmp.h b/setjmp/setjmp.h
index f0babc047b..6b1037fabd 100644
--- a/setjmp/setjmp.h
+++ b/setjmp/setjmp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1999, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1999, 2001, 2002, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -30,10 +30,9 @@ __BEGIN_DECLS
#include <bits/setjmp.h> /* Get `__jmp_buf'. */
#include <bits/sigset.h> /* Get `__sigset_t'. */
-__BEGIN_NAMESPACE_STD
/* Calling environment, plus possibly a saved signal mask. */
-typedef struct __jmp_buf_tag /* C++ doesn't like tagless structs. */
+struct __jmp_buf_tag
{
/* NOTE: The machine-dependent definitions of `__sigsetjmp'
assume that a `jmp_buf' begins with a `__jmp_buf' and that
@@ -42,15 +41,18 @@ typedef struct __jmp_buf_tag /* C++ doesn't like tagless structs. */
__jmp_buf __jmpbuf; /* Calling environment. */
int __mask_was_saved; /* Saved the signal mask? */
__sigset_t __saved_mask; /* Saved signal mask. */
- } jmp_buf[1];
+ };
+
+
+__BEGIN_NAMESPACE_STD
+typedef struct __jmp_buf_tag jmp_buf[1];
/* Store the calling environment in ENV, also saving the signal mask.
Return 0. */
extern int setjmp (jmp_buf __env) __THROW;
__END_NAMESPACE_STD
-__USING_NAMESPACE_STD(__jmp_buf_tag)
/* Store the calling environment in ENV, also saving the
signal mask if SAVEMASK is nonzero. Return 0.
diff --git a/sysdeps/posix/euidaccess.c b/sysdeps/posix/euidaccess.c
index 76a09d455d..333870cdde 100644
--- a/sysdeps/posix/euidaccess.c
+++ b/sysdeps/posix/euidaccess.c
@@ -1,5 +1,5 @@
/* Check if effective user id can access file
- Copyright (C) 1990,1991,1995-2001,2005 Free Software Foundation, Inc.
+ Copyright (C) 1990,1991,1995-2001,2005,2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -128,10 +128,6 @@ euidaccess (path, mode)
#ifdef _LIBC
uid_t euid;
gid_t egid;
-
- if (! __libc_enable_secure)
- /* If we are not set-uid or set-gid, access does the same. */
- return __access (path, mode);
#else
if (have_ids == 0)
{
@@ -162,6 +158,10 @@ euidaccess (path, mode)
/* Now we need the IDs. */
euid = __geteuid ();
egid = __getegid ();
+
+ if (__getuid () == euid && __getgid () == egid)
+ /* If we are not set-uid or set-gid, access does the same. */
+ return __access (path, mode);
#endif
/* The super-user can read and write any file, and execute any file
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 3c5a8cb810..2965a7baf9 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -121,11 +121,11 @@ __BEGIN_NAMESPACE_STD
/* This incomplete type is defined in <time.h> but needed here because
of `wcsftime'. */
struct tm;
+__END_NAMESPACE_STD
/* XXX We have to clean this up at some point. Since tm is in the std
namespace but wcsftime is in __c99 the type wouldn't be found
without inserting it in the global namespace. */
__USING_NAMESPACE_STD(tm)
-__END_NAMESPACE_STD
__BEGIN_NAMESPACE_C99