- 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
Modified: trunk/reactos/drivers/net/npf/time_calls.c
Modified: trunk/reactos/drivers/storage/atapi/atapi.c
Modified: trunk/reactos/drivers/storage/disk/disk.c
Modified: trunk/reactos/lib/mesa32/Makefile
_____
Modified: trunk/reactos/drivers/net/npf/time_calls.c
--- trunk/reactos/drivers/net/npf/time_calls.c 2005-05-10 06:13:39 UTC
(rev 15197)
+++ trunk/reactos/drivers/net/npf/time_calls.c 2005-05-10 06:17:54 UTC
(rev 15198)
@@ -54,6 +54,8 @@
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--;
_____
Modified: trunk/reactos/drivers/storage/atapi/atapi.c
--- trunk/reactos/drivers/storage/atapi/atapi.c 2005-05-10 06:13:39 UTC
(rev 15197)
+++ trunk/reactos/drivers/storage/atapi/atapi.c 2005-05-10 06:17:54 UTC
(rev 15198)
@@ -2070,6 +2070,9 @@
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 @@
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",
_____
Modified: trunk/reactos/drivers/storage/disk/disk.c
--- trunk/reactos/drivers/storage/disk/disk.c 2005-05-10 06:13:39 UTC
(rev 15197)
+++ trunk/reactos/drivers/storage/disk/disk.c 2005-05-10 06:17:54 UTC
(rev 15198)
@@ -1898,7 +1898,7 @@
UNICODE_STRING ValueName;
HANDLE SystemKey;
HANDLE BusKey;
- ULONG DiskNumber;
+ ULONG DiskNumber = 0;
ULONG Length;
#if 0
ULONG i;
_____
Modified: trunk/reactos/lib/mesa32/Makefile
--- trunk/reactos/lib/mesa32/Makefile 2005-05-10 06:13:39 UTC (rev
15197)
+++ trunk/reactos/lib/mesa32/Makefile 2005-05-10 06:17:54 UTC (rev
15198)
@@ -245,7 +245,7 @@
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)