diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2003-04-04 05:12:00 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@redhat.com> | 2003-04-04 05:12:00 +0000 |
| commit | 26b54a6bcabe1c2de97ff7212e2f51d9c193deaf (patch) | |
| tree | 38e540cb0a598dc5447b3dd1144be6dc95a83f83 | |
| parent | ff084b8768620614716a5b230d591656bdec3710 (diff) | |
| download | glibc-26b54a6bcabe1c2de97ff7212e2f51d9c193deaf.tar.gz glibc-26b54a6bcabe1c2de97ff7212e2f51d9c193deaf.tar.xz glibc-26b54a6bcabe1c2de97ff7212e2f51d9c193deaf.zip | |
* sysdeps/unix/sysv/linux/mips/bits/fcntl.h (struct flock): Adjust for n64 abi.
2003-04-04 Alexandre Oliva <aoliva@redhat.com> * sysdeps/unix/sysv/linux/mips/bits/fcntl.h (struct flock): Adjust for n64 abi.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/bits/fcntl.h | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 0c1b9c3ab5..101a229bf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-04-04 Alexandre Oliva <aoliva@redhat.com> + + * sysdeps/unix/sysv/linux/mips/bits/fcntl.h (struct flock): Adjust + for n64 abi. + 2003-04-03 Roland McGrath <roland@redhat.com> * configure.in: Fix up use of compilation flags to match the build: diff --git a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h index 6a09a09ece..97e1867729 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h @@ -1,5 +1,6 @@ /* O_*, F_*, FD_* bit values for Linux. - Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998, 2000, 2002, 2003 + 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 @@ -142,14 +143,20 @@ typedef struct flock #ifndef __USE_FILE_OFFSET64 __off_t l_start; /* Offset where the lock begins. */ __off_t l_len; /* Size of the locked area; zero means until EOF. */ - long int l_sysid; /* XXX */ +#if ! (defined _ABI64 && _MIPS_SIM == _ABI64) + /* The 64-bit flock structure, used by the n64 ABI, and for 64-bit + fcntls in o32 and n32, never has this field. */ + long int l_sysid; +#endif #else __off64_t l_start; /* Offset where the lock begins. */ __off64_t l_len; /* Size of the locked area; zero means until EOF. */ #endif __pid_t l_pid; /* Process holding the lock. */ -#ifndef __USE_FILE_OFFSET64 - long int pad[4]; /* XXX */ +#if ! defined __USE_FILE_OFFSET64 && ! (defined _ABI64 && _MIPS_SIM == _ABI64) + /* The 64-bit flock structure, used by the n64 ABI, and for 64-bit + flock in o32 and n32, never has this field. */ + long int pad[4]; #endif } flock_t; |