[commits] r9613 - in /fsf/trunk/libc: ChangeLog dirent/dirent.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Jan  7 00:02:46 2010
New Revision: 9613

Log:
Import glibc-mainline for 2010-01-07

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/dirent/dirent.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Jan  7 00:02:46 2010
@@ -1,3 +1,7 @@
+2010-01-06  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* dirent/dirent.h: Fix typo in feature selection macro use.
+
 2009-12-15  Maciej W. Rozycki  <macro@xxxxxxxxxxxxxxxx>
 
 	[BZ #11115]

Modified: fsf/trunk/libc/dirent/dirent.h
==============================================================================
--- fsf/trunk/libc/dirent/dirent.h (original)
+++ fsf/trunk/libc/dirent/dirent.h Thu Jan  7 00:02:46 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2000, 2003-2005, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2000,2003-2005,2009,2010 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
@@ -218,7 +218,7 @@
 extern long int telldir (DIR *__dirp) __THROW __nonnull ((1));
 #endif
 
-#if defined __USE_BSD || defined __USE_MISC || defined __XOPEN_2K8
+#if defined __USE_BSD || defined __USE_MISC || defined __XOPEN2K8
 
 /* Return the file descriptor used by DIRP.  */
 extern int dirfd (DIR *__dirp) __THROW __nonnull ((1));