From 635fa4ba48fb36f36f4b1d333320aedc6b28e132 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Mon, 1 Dec 2003 09:11:42 +0000 Subject: [PATCH] * include/winnt.h (GetCurrentFiber): Remove duplicate prototype. (GetFiberData); Likewise. (GetCurrentFiber): Change volatile to __volatile__. (GetFiberData); Likewise. --- winsup/w32api/ChangeLog | 7 +++++++ winsup/w32api/include/winnt.h | 7 ++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index c4a02e716..7f2113f3e 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,10 @@ +2003-12-01 Danny Smith + + * include/winnt.h (GetCurrentFiber): Remove duplicate prototype. + (GetFiberData); Likewise. + (GetCurrentFiber): Change volatile to __volatile__. + (GetFiberData); Likewise. + 2003-11-27 Christopher Faylor * lib/Makefile.in: Use make function to locate .mri file to allow diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 17bfeb90b..683d01027 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -3280,14 +3280,11 @@ ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE); #if defined(__GNUC__) -PVOID GetCurrentFiber(void); -PVOID GetFiberData(void); - PVOID GetCurrentFiber(void); extern __inline__ PVOID GetCurrentFiber(void) { void* ret; - __asm__ volatile ( + __asm__ __volatile__ ( "movl %%fs:0x10,%0" : "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */ ); @@ -3298,7 +3295,7 @@ PVOID GetFiberData(void); extern __inline__ PVOID GetFiberData(void) { void* ret; - __asm__ volatile ( + __asm__ __volatile__ ( "movl %%fs:0x10,%0\n" "movl (%0),%0" : "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */