Revision: 2700 Author: rowledge Date: 2013-03-07 14:33:19 -0800 (Thu, 07 Mar 2013) Log Message: ----------- update ioShowDisplayOnWindow etc to use unsigned char * for dispBitsIndex. Nasty makefile flag suppresses type errors

Modified Paths: -------------- trunk/platforms/RiscOS/misc/ToCopy/MakeFile trunk/platforms/RiscOS/vm/sqRPCWindows.c

Modified: trunk/platforms/RiscOS/misc/ToCopy/MakeFile =================================================================== --- trunk/platforms/RiscOS/misc/ToCopy/MakeFile 2013-03-07 22:30:42 UTC (rev 2699) +++ trunk/platforms/RiscOS/misc/ToCopy/MakeFile 2013-03-07 22:33:19 UTC (rev 2700) @@ -8,7 +8,7 @@ .c.o:; cc $(ccflags) -o $@ $*.c

# Toolflags: -CCflags = -c -fa -Wabp -depend !Depend -IC:,OSLib:,C:^.rink,$(PVM),$(CVM),$(SVM) -throwback -DACORN -D__LITTLE_ENDIAN -Otime +CCflags = -c -fa -Wabpdnv -ec -depend !Depend -IC:,OSLib:,C:^.rink,$(PVM),$(CVM),$(SVM) -throwback -DACORN -D__LITTLE_ENDIAN -Otime # extra ccflags for debugging go here because rink doesnt deal with debug # segment. remember to use ccvmflags with all core vm files #CCVMflags = $(ccflags) -g

Modified: trunk/platforms/RiscOS/vm/sqRPCWindows.c =================================================================== --- trunk/platforms/RiscOS/vm/sqRPCWindows.c 2013-03-07 22:30:42 UTC (rev 2699) +++ trunk/platforms/RiscOS/vm/sqRPCWindows.c 2013-03-07 22:33:19 UTC (rev 2700) @@ -1177,7 +1177,7 @@ * BitBlt has messed with part of the Display/Window - inform the WIMP so * that it gets redrawn when we do HandleEvents and get a * wimp_REDRAW_WINDOW_REQUEST */ -int ioShowDisplayOnWindow( unsigned * dispBitsIndex, int width, int height, int depth, int affectedL, int affectedR, int affectedT, int affectedB, int windowIndex) { +int ioShowDisplayOnWindow( unsigned char * dispBitsIndex, int width, int height, int depth, int affectedL, int affectedR, int affectedT, int affectedB, int windowIndex) { os_error *e; windowDescriptorBlock * thisWindow; /* quickly check bounds */ @@ -1453,7 +1453,7 @@

/* Backwards compat stub */ sqInt ioShowDisplay( sqInt dispBitsIndex, sqInt width, sqInt height, sqInt depth, sqInt affectedL, sqInt affectedR, sqInt affectedT, sqInt affectedB) { - return ioShowDisplayOnWindow( (unsigned *)dispBitsIndex, width, height, depth, affectedL, affectedR, affectedT, affectedB, 1); + return ioShowDisplayOnWindow( (unsigned char *)dispBitsIndex, width, height, depth, affectedL, affectedR, affectedT, affectedB, 1); }