diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-08-03 02:43:06 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-08-03 02:43:06 +0000 |
| commit | 9b2e9577b228350b15d88303b00097dd58e8d29b (patch) | |
| tree | 82493d0106a8f6de24685458f79cbf3b9525179c /sysdeps/unix/dirstream.h | |
| parent | 497af0cb21612530874e9471fb52f20d19c14026 (diff) | |
| download | glibc-9b2e9577b228350b15d88303b00097dd58e8d29b.tar.gz glibc-9b2e9577b228350b15d88303b00097dd58e8d29b.tar.xz glibc-9b2e9577b228350b15d88303b00097dd58e8d29b.zip | |
* sysdeps/unix/dirstream.h (struct __dirstream): Move lock member
to fill a hole on 64-bit platforms. * stdlib/stdlib.h: Remove __strto*_internal prototypes and strto* inline functions. * include/stdlib.h: Add __strto*_internal prototypes here. * wcsmbs/wchar.h: Remove __wcsto*_internal prototypes and wcsto* inline functions. * include/wchar.h: Add __wcsto*_internal prototypes. * sysdeps/generic/inttypes.h: No need to protect the declaration of the __strto*_internal and __wcsto*_internal members here.
Diffstat (limited to 'sysdeps/unix/dirstream.h')
| -rw-r--r-- | sysdeps/unix/dirstream.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/unix/dirstream.h b/sysdeps/unix/dirstream.h index a1f74473c6..b1d80f0017 100644 --- a/sysdeps/unix/dirstream.h +++ b/sysdeps/unix/dirstream.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995, 1996, 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 @@ -33,14 +33,14 @@ struct __dirstream { int fd; /* File descriptor. */ + __libc_lock_define (, lock) /* Mutex lock for this structure. */ + char *data; /* Directory block. */ size_t allocation; /* Space allocated for the block. */ size_t size; /* Total valid data in the block. */ size_t offset; /* Current offset into the block. */ off_t filepos; /* Position of next entry to read. */ - - __libc_lock_define (, lock) /* Mutex lock for this structure. */ }; #define _DIR_dirfd(dirp) ((dirp)->fd) |