qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

2004-07-09  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/fcntl.c (__fcntl_nocancel): Move attribute
	to the front for gcc 3.5+.
	* sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c: Likewise.
	* include/fcntl.h: Don't declare __fcntl_nocancel here if
	NO_CANCELLATION is defined.
This commit is contained in:
Ulrich Drepper 2004-07-09 17:20:48 +00:00
parent 1b8cbd0847
commit d199bfb222
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2004-07-09 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/fcntl.c (__fcntl_nocancel): Move attribute
to the front for gcc 3.5+.
* sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c: Likewise.
* include/fcntl.h: Don't declare __fcntl_nocancel here if
NO_CANCELLATION is defined.
2004-07-07 Jakub Jelinek <jakub@redhat.com> 2004-07-07 Jakub Jelinek <jakub@redhat.com>
* elf/dl-fini.c (_dl_fini): Add nloaded variable, load * elf/dl-fini.c (_dl_fini): Add nloaded variable, load

2
include/fcntl.h
View File

@ -9,8 +9,10 @@ extern int __libc_open (const char *file, int oflag, ...);
libc_hidden_proto (__libc_open) libc_hidden_proto (__libc_open)
extern int __libc_creat (const char *file, mode_t mode); extern int __libc_creat (const char *file, mode_t mode);
extern int __libc_fcntl (int fd, int cmd, ...); extern int __libc_fcntl (int fd, int cmd, ...);
#ifndef NO_CANCELLATION
extern int __fcntl_nocancel (int fd, int cmd, ...) attribute_hidden; extern int __fcntl_nocancel (int fd, int cmd, ...) attribute_hidden;
libc_hidden_proto (__libc_fcntl) libc_hidden_proto (__libc_fcntl)
#endif
extern int __open (__const char *__file, int __oflag, ...); extern int __open (__const char *__file, int __oflag, ...);
libc_hidden_proto (__open) libc_hidden_proto (__open)
extern int __fcntl (int __fd, int __cmd, ...); extern int __fcntl (int __fd, int __cmd, ...);

4
sysdeps/unix/sysv/linux/fcntl.c
View File

@ -18,17 +18,17 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <sysdep-cancel.h> /* Must come before <fcntl.h>. */
#include <fcntl.h> #include <fcntl.h>
#include <stdarg.h> #include <stdarg.h>
#include <sysdep-cancel.h>
#include <sys/syscall.h> #include <sys/syscall.h>
int
#ifdef NO_CANCELLATION #ifdef NO_CANCELLATION
static inline __attribute ((always_inline)) static inline __attribute ((always_inline))
#endif #endif
int
__fcntl_nocancel (int fd, int cmd, ...) __fcntl_nocancel (int fd, int cmd, ...)
{ {
va_list ap; va_list ap;

4
sysdeps/unix/sysv/linux/i386/fcntl.c
View File

@ -18,10 +18,10 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <sysdep-cancel.h> /* Must come before <fcntl.h>. */
#include <fcntl.h> #include <fcntl.h>
#include <stdarg.h> #include <stdarg.h>
#include <sysdep-cancel.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include "../kernel-features.h" #include "../kernel-features.h"
@ -31,10 +31,10 @@ int __have_no_fcntl64;
#endif #endif
int
#ifdef NO_CANCELLATION #ifdef NO_CANCELLATION
static inline __attribute ((always_inline)) static inline __attribute ((always_inline))
#endif #endif
int
__fcntl_nocancel (int fd, int cmd, ...) __fcntl_nocancel (int fd, int cmd, ...)
{ {
va_list ap; va_list ap;

4
sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c
View File

@ -18,17 +18,17 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <sysdep-cancel.h> /* Must come before <fcntl.h>. */
#include <fcntl.h> #include <fcntl.h>
#include <stdarg.h> #include <stdarg.h>
#include <sysdep-cancel.h>
#include <sys/syscall.h> #include <sys/syscall.h>
int
#ifdef NO_CANCELLATION #ifdef NO_CANCELLATION
static inline __attribute ((always_inline)) static inline __attribute ((always_inline))
#endif #endif
int
__fcntl_nocancel (int fd, int cmd, ...) __fcntl_nocancel (int fd, int cmd, ...)
{ {
va_list ap; va_list ap;