* include/winnt.h (GetCurrentFiber): Remove duplicate prototype.

(GetFiberData); Likewise.

	(GetCurrentFiber): Change volatile to __volatile__.
	(GetFiberData); Likewise.
This commit is contained in:
Danny Smith 2003-12-01 09:11:42 +00:00
parent b406ed7b51
commit 635fa4ba48
2 changed files with 9 additions and 5 deletions

View File

@ -1,3 +1,10 @@
2003-12-01 Danny Smith <dannysmith@users.sourceforge.net>
* include/winnt.h (GetCurrentFiber): Remove duplicate prototype.
(GetFiberData); Likewise.
(GetCurrentFiber): Change volatile to __volatile__.
(GetFiberData); Likewise.
2003-11-27 Christopher Faylor <cgf@redhat.com> 2003-11-27 Christopher Faylor <cgf@redhat.com>
* lib/Makefile.in: Use make function to locate .mri file to allow * lib/Makefile.in: Use make function to locate .mri file to allow

View File

@ -3280,14 +3280,11 @@ ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE);
#if defined(__GNUC__) #if defined(__GNUC__)
PVOID GetCurrentFiber(void);
PVOID GetFiberData(void);
PVOID GetCurrentFiber(void); PVOID GetCurrentFiber(void);
extern __inline__ PVOID GetCurrentFiber(void) extern __inline__ PVOID GetCurrentFiber(void)
{ {
void* ret; void* ret;
__asm__ volatile ( __asm__ __volatile__ (
"movl %%fs:0x10,%0" "movl %%fs:0x10,%0"
: "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */ : "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */
); );
@ -3298,7 +3295,7 @@ PVOID GetFiberData(void);
extern __inline__ PVOID GetFiberData(void) extern __inline__ PVOID GetFiberData(void)
{ {
void* ret; void* ret;
__asm__ volatile ( __asm__ __volatile__ (
"movl %%fs:0x10,%0\n" "movl %%fs:0x10,%0\n"
"movl (%0),%0" "movl (%0),%0"
: "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */ : "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */