From d421003cd4b5f7b6861393f95413d846028d3ad1 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Tue, 10 May 2005 06:17:54 +0000
Subject: [PATCH] - disable -Werror for lib/mesa32 to get it to compile with
 GCC4, however, an upgrade to 6.2.1 would solve these problems - fixed a few
 more warnings, the the tree should now fully compile and work with GCC4

svn path=/trunk/; revision=15198
---
 reactos/drivers/net/npf/time_calls.c  | 2 ++
 reactos/drivers/storage/atapi/atapi.c | 6 ++++++
 reactos/drivers/storage/disk/disk.c   | 2 +-
 reactos/lib/mesa32/Makefile           | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/reactos/drivers/net/npf/time_calls.c b/reactos/drivers/net/npf/time_calls.c
index 1e9287963bc..e2ae23ff30e 100644
--- a/reactos/drivers/net/npf/time_calls.c
+++ b/reactos/drivers/net/npf/time_calls.c
@@ -54,6 +54,8 @@ VOID TIME_SYNCHRONIZE(struct time_conv *data)
 	tmp.tv_usec-=(LONG)((PTime.QuadPart%TimeFreq.QuadPart)*1000000/TimeFreq.QuadPart);
 #else
     // TODO FIXME:
+        tmp.tv_sec = 0;
+        tmp.tv_usec = 0;
 #endif
 	if (tmp.tv_usec<0) {
 		tmp.tv_sec--;
diff --git a/reactos/drivers/storage/atapi/atapi.c b/reactos/drivers/storage/atapi/atapi.c
index a8362632b83..a039a160a11 100644
--- a/reactos/drivers/storage/atapi/atapi.c
+++ b/reactos/drivers/storage/atapi/atapi.c
@@ -2070,6 +2070,9 @@ AtapiReadWrite(PATAPI_MINIPORT_EXTENSION DeviceExtension,
       SectorNumber[0] = StartingSector & 0xff;
       CylinderLow[0] = (StartingSector >> 8) & 0xff;
       CylinderHigh[0] = (StartingSector >> 16) & 0xff;
+      SectorNumber[1] = 0;
+      CylinderLow[1] = 0;
+      CylinderHigh[1] = 0;
       DrvHead = ((StartingSector >> 24) & 0x0f) |
                  (Srb->TargetId ? IDE_DH_DRV1 : 0) |
 		 IDE_DH_LBA;
@@ -2092,6 +2095,9 @@ AtapiReadWrite(PATAPI_MINIPORT_EXTENSION DeviceExtension,
       StartingSector /= DeviceParams->LogicalHeads;
       CylinderLow[0] = StartingSector & 0xff;
       CylinderHigh[0] = StartingSector >> 8;
+      SectorNumber[1] = 0;
+      CylinderLow[1] = 0;
+      CylinderHigh[1] = 0;
 
       DPRINT("%s:BUS=%04x:DRV=%d:LBA=0:CH=%02x:CL=%02x:HD=%01x:SN=%02x:SC=%02x:CM=%02x\n",
              (Srb->SrbFlags & SRB_FLAGS_DATA_IN) ? "READ" : "WRITE",
diff --git a/reactos/drivers/storage/disk/disk.c b/reactos/drivers/storage/disk/disk.c
index 0dbaeadfc76..3ffb6ab7310 100644
--- a/reactos/drivers/storage/disk/disk.c
+++ b/reactos/drivers/storage/disk/disk.c
@@ -1898,7 +1898,7 @@ ScsiDiskUpdateFixedDiskGeometry(IN PDEVICE_EXTENSION DeviceExtension)
   UNICODE_STRING ValueName;
   HANDLE SystemKey;
   HANDLE BusKey;
-  ULONG DiskNumber;
+  ULONG DiskNumber = 0;
   ULONG Length;
 #if 0
   ULONG i;
diff --git a/reactos/lib/mesa32/Makefile b/reactos/lib/mesa32/Makefile
index cfd2fa7dd89..40b81912516 100644
--- a/reactos/lib/mesa32/Makefile
+++ b/reactos/lib/mesa32/Makefile
@@ -245,7 +245,7 @@ TARGET_NAME = mesa32
 
 TARGET_BASE = $(TARGET_BASE_LIB_MESA32)
 
-TARGET_CFLAGS = -D__USE_W32API -Wall -Werror $(MESA_CFLAGS) $(MESA_INCLUDE_DIRS)
+TARGET_CFLAGS = -D__USE_W32API -Wall $(MESA_CFLAGS) $(MESA_INCLUDE_DIRS)
 
 TARGET_ASFLAGS = $(TARGET_CFLAGS)