diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-03-18 18:01:40 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-03-18 18:01:40 +0000 |
commit | 57fa34b52e7c26f780c6bcae7a8ea863dfe710e1 (patch) | |
tree | 1fe2959ca795d67fb10559d0f300b06c2fd0b68c /libc/sysdeps/unix/opendir.c | |
parent | e97d73d87846a62aff09c388bd938c0b1d410931 (diff) | |
download | eglibc2-57fa34b52e7c26f780c6bcae7a8ea863dfe710e1.tar.gz |
Merge changes between r1382 and r1748 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@1749 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix/opendir.c')
-rw-r--r-- | libc/sysdeps/unix/opendir.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libc/sysdeps/unix/opendir.c b/libc/sysdeps/unix/opendir.c index 6aa738fb6..59772cda7 100644 --- a/libc/sysdeps/unix/opendir.c +++ b/libc/sysdeps/unix/opendir.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991-1996,98,2000-2003,2005 Free Software Foundation, Inc. +/* Copyright (C) 1991-1996,98,2000-2003,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 @@ -173,7 +174,9 @@ __alloc_dir (int fd, bool close_fd, const struct stat64 *statp) dirp->allocation = allocation; dirp->fd = fd; +#ifndef NOT_IN_libc __libc_lock_init (dirp->lock); +#endif return dirp; } |