summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--stdio-common/stdio_lim.h.in6
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f749c51d4..348d7f35ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-04-25  Ulrich Drepper  <drepper@redhat.com>
 
+	* stdio-common/stdio_lim.h.in (L_cuserid): Not part of POSIX since
+	the 2001 revision.
+
 	* libio/tst-widetext.input: Remove surrogates.
 
 	* include/features.h: _POSIX_C_SOURCE >= 200112L implies C99.
diff --git a/stdio-common/stdio_lim.h.in b/stdio-common/stdio_lim.h.in
index bb496c59de..806326d953 100644
--- a/stdio-common/stdio_lim.h.in
+++ b/stdio-common/stdio_lim.h.in
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1997, 1998, 1999, 2009 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
@@ -27,7 +27,9 @@
 
 # ifdef __USE_POSIX
 #  define L_ctermid @L_ctermid@
-#  define L_cuserid @L_cuserid@
+#  ifndef __USE_XOPEN2K
+#   define L_cuserid @L_cuserid@
+#  endif
 # endif
 #endif