diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 1918d8bf0f..9194b9b67d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-05-22 H.J. Lu <hongjiu.lu@intel.com> + * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Don't include + <bits/wordsize.h>. Check __x86_64__ instead of __WORDSIZE. + * sysdeps/unix/sysv/linux/i386/sysdep.h (SYSCALL_ERROR_HANDLER): Use "neg %eax". diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h index b38d55cf54..9fa5ecb725 100644 --- a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h @@ -1,6 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux/x86-64. - Copyright (C) 2001,2002,2004,2006,2007,2009,2010,2011 - Free Software Foundation, Inc. + Copyright (C) 2001-2012 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 @@ -22,7 +21,6 @@ #endif #include <sys/types.h> -#include <bits/wordsize.h> #ifdef __USE_GNU # include <bits/uio.h> #endif @@ -65,7 +63,7 @@ #endif #ifdef __USE_LARGEFILE64 -# if __WORDSIZE == 64 +# ifdef __x86_64__ # define O_LARGEFILE 0 # else # define O_LARGEFILE 0100000 @@ -78,7 +76,7 @@ #define F_SETFD 2 /* Set file descriptor flags. */ #define F_GETFL 3 /* Get file status flags. */ #define F_SETFL 4 /* Set file status flags. */ -#if __WORDSIZE == 64 +#ifdef __x86_64__ # define F_GETLK 5 /* Get record locking info. */ # define F_SETLK 6 /* Set record locking info (non-blocking). */ # define F_SETLKW 7 /* Set record locking info (blocking). */ |