* 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].

2 files changed, 2 insertions, 51 deletions

diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index ec991b95c..c1c193cbe 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -128,7 +128,7 @@ UUID_OBJS = mshtml-uuid.o msxml-uuid.o unknwn-uuid.o \
 			olectlid-uuid.o ativscp-uuid.o urlmon-uuid.o hlink-uuid.o \
 			hlguids-uuid.o extras-uuid.o devguid.o
 EXTRA_OBJS = shell32.o scrnsave.o scrnsavw.o largeint.o \
-	$(UUID_OBJS) kernel32.o ws2_32.o
+	$(UUID_OBJS) ws2_32.o
 UUID_SOURCES = mshtml-uuid.c msxml-uuid.c unknwn-uuid.c \
 			   servprov-uuid.c oleidl-uuid.c oleacc-uuid.c ocidl-uuid.c \
 			   objsafe-uuid.c oaidl-uuid.c docobj-uuid.c comcat-uuid.c \
@@ -136,7 +136,7 @@ UUID_SOURCES = mshtml-uuid.c msxml-uuid.c unknwn-uuid.c \
 			   olectlid-uuid.c ativscp-uuid.c urlmon-uuid.c hlink-uuid.c \
 			   hlguids-uuid.c extras-uuid.c devguid.c
 SOURCES = scrnsave.c shell32.c  largeint.c $(UUID_SOURCES)\
-res.rc test.c kernel32.c ws2_32.c
+res.rc test.c ws2_32.c
 
 DISTFILES = Makefile.in $(DEF_FILES) $(MRI_FILES) $(SOURCES)
 
diff --git a/winsup/w32api/lib/kernel32.c b/winsup/w32api/lib/kernel32.c
deleted file mode 100644
index 08ff86c25..000000000
--- a/winsup/w32api/lib/kernel32.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* extern (library) versions of inline functions defined in winnt.h */
-
-#if defined(__GNUC__)
-
-void* GetCurrentFiber(void)
-{
-    void* ret;
-    __asm__ volatile (
-	"movl	%%fs:0x10,%0"
-	: "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */
-	);
-    return ret;
-}
-
-void* GetFiberData(void)
-{
-    void* ret;
-    __asm__ volatile (            
-	"movl	%%fs:0x10,%0\n"
-	"movl	(%0),%0"
-	: "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */
-	);
-    return ret;
-}
-
-#elif !defined (__WATCOMC__)
-
-void* GetCurrentFiber(void)
-{
-    void* res;
-    _asm {
-    	mov	eax, dword ptr fs:0x10
-    	mov	res, eax
-    };
-    return res;
-}
-
-void* GetFiberData(void)
-{
-    void* res;
-    _asm {
-	mov	eax, dword ptr fs:0x10
-	mov	eax, [eax]
-	mov	res, eax
-    };
-    return res;
-}
-
-#endif /* __GNUC__ */