From a45b9181eaab44e22ad501bd733b05e98f040e35 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Thu, 2 Nov 2006 00:54:46 +0000 Subject: * include/winuser.h (LR_DEFAULTSIZE): Remove duplicate. C99 'extern inline' patrol. * include/winnt.h (GetCurrentFiber): Remove extern declaration. Make inline static. (GetFiberData): Likewise. * lib/kernel32.c: Remove. * lib/Makefile.in: Remove reference to kernel32.[co]. --- winsup/w32api/include/winnt.h | 11 ++++------- winsup/w32api/include/winuser.h | 1 - 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'winsup/w32api/include') diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 502705b67..dcdb90b7a 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -3815,14 +3815,11 @@ ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE); (TypeBitMask), (ComparisonType))) #endif -PVOID GetCurrentFiber(void); -PVOID GetFiberData(void); - #ifdef _X86_ #if defined(__GNUC__) #if (__GNUC__ >= 3) /* Support -masm=intel. */ -extern __inline__ PVOID GetCurrentFiber(void) +static __inline__ PVOID GetCurrentFiber(void) { void* ret; __asm__ __volatile__ ( @@ -3832,7 +3829,7 @@ extern __inline__ PVOID GetCurrentFiber(void) return ret; } -extern __inline__ PVOID GetFiberData(void) +static __inline__ PVOID GetFiberData(void) { void* ret; __asm__ __volatile__ ( @@ -3857,7 +3854,7 @@ static __inline__ struct _TEB * NtCurrentTeb(void) } #else /* __GNUC__ >= 3 */ -extern __inline__ PVOID GetCurrentFiber(void) +static __inline__ PVOID GetCurrentFiber(void) { void* ret; __asm__ __volatile__ ( @@ -3867,7 +3864,7 @@ extern __inline__ PVOID GetCurrentFiber(void) return ret; } -extern __inline__ PVOID GetFiberData(void) +static __inline__ PVOID GetFiberData(void) { void* ret; __asm__ __volatile__ ( diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 7d3dd7a30..69232407f 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -941,7 +941,6 @@ extern "C" { #define SM_CXMAXIMIZED 61 #define SM_CYMAXIMIZED 62 #define SM_NETWORK 63 -#define LR_DEFAULTSIZE 64 #define SM_CLEANBOOT 67 #define SM_CXDRAG 68 #define SM_CYDRAG 69 -- cgit v1.2.3