From c1c75ffd5e2de555bd54273e109cc452cddbc311 Mon Sep 17 00:00:00 2001
From: David Welch <welch@cwcom.net>
Date: Tue, 20 Feb 2001 14:43:46 +0000
Subject: [PATCH] Fix from Mike Lerwill for KeStallExecutionProcessor

svn path=/trunk/; revision=1645
---
 reactos/include/user32/sysmetr.h  |  4 ++--
 reactos/ntoskrnl/hal/x86/udelay.c |  4 ++--
 reactos/ntoskrnl/ke/error.c       | 23 +++++++++++------------
 reactos/rules.mak                 |  2 +-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/reactos/include/user32/sysmetr.h b/reactos/include/user32/sysmetr.h
index eee188ad631..270237d51a4 100644
--- a/reactos/include/user32/sysmetr.h
+++ b/reactos/include/user32/sysmetr.h
@@ -44,8 +44,8 @@
 #else
 #define SYSMETRICS_CXMINTRACK       100
 #define SYSMETRICS_CYMINTRACK        28
-#endif
-#endif 0
+#endif /* WIN_95_LOOK */
+#endif /* 0 */
 
 /* Some non-constant system metrics */
 #define SYSMETRICS_CXSCREEN             sysMetrics[SM_CXSCREEN]             /* 0 */
diff --git a/reactos/ntoskrnl/hal/x86/udelay.c b/reactos/ntoskrnl/hal/x86/udelay.c
index f0760bd2174..42d9e8bac28 100644
--- a/reactos/ntoskrnl/hal/x86/udelay.c
+++ b/reactos/ntoskrnl/hal/x86/udelay.c
@@ -20,7 +20,7 @@
  * MA 02139, USA.  
  *
  */
-/* $Id: udelay.c,v 1.5 2000/11/19 15:57:27 ekohl Exp $
+/* $Id: udelay.c,v 1.6 2001/02/20 14:43:46 dwelch Exp $
  *
  * PROJECT:        ReactOS kernel
  * FILE:           ntoskrnl/hal/x86/udelay.c
@@ -105,7 +105,7 @@ __KeStallExecutionProcessor(ULONG Loops)
 
 VOID STDCALL KeStallExecutionProcessor(ULONG Microseconds)
 {
-   return(__KeStallExecutionProcessor((delay_count*(Microseconds/1000))));
+   return(__KeStallExecutionProcessor((delay_count*Microseconds)/1000));
 }
 
 #define HZ (100)
diff --git a/reactos/ntoskrnl/ke/error.c b/reactos/ntoskrnl/ke/error.c
index bd3bf1b2a30..f0f82a48a7a 100644
--- a/reactos/ntoskrnl/ke/error.c
+++ b/reactos/ntoskrnl/ke/error.c
@@ -17,21 +17,20 @@
 
 /* FUNCTIONS ***************************************************************/
 
-NTSTATUS STDCALL NtRaiseHardError(IN NTSTATUS Status,
-                                  ULONG Unknown2,
-                                  ULONG Unknown3,
-                                  ULONG Unknown4,
-                                  ULONG Unknown5,
-                                  ULONG Unknown6)
+NTSTATUS STDCALL 
+NtRaiseHardError(IN NTSTATUS Status,
+		 ULONG Unknown2,
+		 ULONG Unknown3,
+		 ULONG Unknown4,
+		 ULONG Unknown5,
+		 ULONG Unknown6)
 {
-//   UNIMPLEMENTED;
-
-   KeBugCheck(Status);
-
-   return STATUS_SUCCESS;
+  DPRINT1("Hard error %x\n", Status);
+  return(STATUS_SUCCESS);
 }
 
-NTSTATUS STDCALL NtSetDefaultHardErrorPort(IN HANDLE PortHandle)
+NTSTATUS STDCALL 
+NtSetDefaultHardErrorPort(IN HANDLE PortHandle)
 {
    UNIMPLEMENTED;
 }
diff --git a/reactos/rules.mak b/reactos/rules.mak
index a486b2d6f36..04d798e371b 100644
--- a/reactos/rules.mak
+++ b/reactos/rules.mak
@@ -53,7 +53,7 @@ CC = $(PREFIX)gcc
 CXX = $(PREFIX)g++
 HOST_CC = gcc
 HOST_NM = nm
-CFLAGS := $(CFLAGS) -I$(PATH_TO_TOP)/include -pipe
+CFLAGS := $(CFLAGS) -I$(PATH_TO_TOP)/include -pipe -m386
 CXXFLAGS = $(CFLAGS)
 NFLAGS = -i$(PATH_TO_TOP)/include/ -f$(NASM_FORMAT) -d$(NASM_FORMAT)
 LD = $(PREFIX)ld