From e7940ebdad325b782c86871bf2a0bf05491c088e Mon Sep 17 00:00:00 2001
From: Casper Hornstrup <chorns@users.sourceforge.net>
Date: Sun, 13 Apr 2003 17:38:27 +0000
Subject: [PATCH] 2003-04-13  Casper S. Hornstrup 
 <chorns@users.sourceforge.net>

	* ntoskrnl/kd/gdbstub.c (KdEnterDebuggerException): Fix signed/unsigned
	comparison warning.
	* ntoskrnl/ke/i386/exp.c (KiKernelTrapHandler): Ditto.
	* ntoskrnl/ke/i386/usertrap.c (KiUserTrapHandler): Ditto.
	* tools/helper.mk: Do not install static libraries.

svn path=/trunk/; revision=4533
---
 reactos/ChangeLog                   |  8 ++++++++
 reactos/ntoskrnl/kd/gdbstub.c       |  2 +-
 reactos/ntoskrnl/ke/i386/exp.c      |  2 +-
 reactos/ntoskrnl/ke/i386/usertrap.c |  2 +-
 reactos/tools/helper.mk             | 23 +++++++++++++++++------
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index fb95e52dd83..87582b575bf 100644
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-13  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+	* ntoskrnl/kd/gdbstub.c (KdEnterDebuggerException): Fix signed/unsigned
+	comparison warning.
+	* ntoskrnl/ke/i386/exp.c (KiKernelTrapHandler): Ditto.
+	* ntoskrnl/ke/i386/usertrap.c (KiUserTrapHandler): Ditto.
+	* tools/helper.mk: Do not install static libraries.
+
 2003-04-13  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
 	* tools/Makefile: Fix rule for mkflpimg.
diff --git a/reactos/ntoskrnl/kd/gdbstub.c b/reactos/ntoskrnl/kd/gdbstub.c
index 6890abebe59..ef8294aabd1 100644
--- a/reactos/ntoskrnl/kd/gdbstub.c
+++ b/reactos/ntoskrnl/kd/gdbstub.c
@@ -996,7 +996,7 @@ KdEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord,
   /* Disable hardware debugging while we are inside the stub */
   __asm__("movl %0,%%db7" : /* no output */ : "r" (0));
 
-  if (STATUS_ACCESS_VIOLATION == ExceptionRecord->ExceptionCode &&
+  if (STATUS_ACCESS_VIOLATION == (NTSTATUS) ExceptionRecord->ExceptionCode &&
       NULL != GspAccessLocation &&
       (ULONG_PTR) GspAccessLocation ==
       (ULONG_PTR) ExceptionRecord->ExceptionInformation[1])
diff --git a/reactos/ntoskrnl/ke/i386/exp.c b/reactos/ntoskrnl/ke/i386/exp.c
index cd9d7ff6fb2..66dd53f857b 100644
--- a/reactos/ntoskrnl/ke/i386/exp.c
+++ b/reactos/ntoskrnl/ke/i386/exp.c
@@ -181,7 +181,7 @@ KiKernelTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr, PVOID Cr2)
       Er.NumberParameters = 0;
     }
 
-  Er.ExceptionFlags = (STATUS_SINGLE_STEP == Er.ExceptionCode || STATUS_BREAKPOINT == Er.ExceptionCode ?
+  Er.ExceptionFlags = (STATUS_SINGLE_STEP == (NTSTATUS) Er.ExceptionCode || STATUS_BREAKPOINT == (NTSTATUS) Er.ExceptionCode ?
                        0 : EXCEPTION_NONCONTINUABLE);
 
   KiDispatchException(&Er, 0, Tf, KernelMode, TRUE);
diff --git a/reactos/ntoskrnl/ke/i386/usertrap.c b/reactos/ntoskrnl/ke/i386/usertrap.c
index 67e5b54cd27..d8e7214b08c 100644
--- a/reactos/ntoskrnl/ke/i386/usertrap.c
+++ b/reactos/ntoskrnl/ke/i386/usertrap.c
@@ -144,7 +144,7 @@ KiUserTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr, PVOID Cr2)
     }
   
 
-  Er.ExceptionFlags = (STATUS_SINGLE_STEP == Er.ExceptionCode || STATUS_BREAKPOINT == Er.ExceptionCode ?
+  Er.ExceptionFlags = (STATUS_SINGLE_STEP == (NTSTATUS) Er.ExceptionCode || STATUS_BREAKPOINT == (NTSTATUS) Er.ExceptionCode ?
                        0 : EXCEPTION_NONCONTINUABLE);
 
   KiDispatchException(&Er, 0, Tf, UserMode, TRUE);
diff --git a/reactos/tools/helper.mk b/reactos/tools/helper.mk
index 0380591757e..46c953cd941 100644
--- a/reactos/tools/helper.mk
+++ b/reactos/tools/helper.mk
@@ -1,4 +1,4 @@
-# $Id: helper.mk,v 1.33 2003/04/13 03:24:26 hyperion Exp $
+# $Id: helper.mk,v 1.34 2003/04/13 17:38:27 chorns Exp $
 #
 # Helper makefile for ReactOS modules
 # Variables this makefile accepts:
@@ -170,9 +170,9 @@ ifeq ($(TARGET_TYPE),library)
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH :=
   MK_IMPLIB_EXT :=
-  MK_INSTALLDIR := system32
+  MK_INSTALLDIR := # none
   MK_BOOTCDDIR := system32
-  MK_DISTDIR := # FIXME
+  MK_DISTDIR := # none
   MK_RES_BASE :=
 endif
 
@@ -711,8 +711,19 @@ bootcd:
 else # MK_IMPLIBONLY
 
 
+# Don't install static libraries
+ifeq ($(MK_MODE),static)
+
+install:
+	-
+
+else # MK_MODE
+
 install: $(INSTALL_DIR)/$(MK_INSTALLDIR)/$(MK_FULLNAME)
 
+endif # MK_MODE
+
+
 ifeq ($(INSTALL_SYMBOLS),no)
 
 $(INSTALL_DIR)/$(MK_INSTALLDIR)/$(MK_FULLNAME):
@@ -720,11 +731,11 @@ $(INSTALL_DIR)/$(MK_INSTALLDIR)/$(MK_FULLNAME):
 
 else # INSTALL_SYMBOLS
 
-# Static library targets do not have a .sym file
+# Don't install static libraries
 ifeq ($(MK_MODE),static)
 
-$(INSTALL_DIR)/$(MK_INSTALLDIR)/$(MK_FULLNAME): $(MK_FULLNAME)
-	$(CP) $(MK_FULLNAME) $(INSTALL_DIR)/$(MK_INSTALLDIR)/$(MK_FULLNAME)
+install:
+	-
 
 else # MK_MODE