- make vga buildable on msvc. Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h _____
Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c --- trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2006-01-07 21:55:47 UTC (rev 20675) +++ trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2006-01-07 22:03:31 UTC (rev 20676) @@ -7,7 +7,7 @@
#include <debug.h>
typedef BOOL (*PFN_VGABlt)(SURFOBJ*, SURFOBJ*, XLATEOBJ*, RECTL*, POINTL*); -typedef BOOL STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj, +typedef BOOL (STDCALL *PBLTRECTFUNC)(SURFOBJ* OutputObj, SURFOBJ* InputObj, SURFOBJ* Mask, XLATEOBJ* ColorTranslation, _____
Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2006-01-07 21:55:47 UTC (rev 20675) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2006-01-07 22:03:31 UTC (rev 20676) @@ -35,37 +35,7 @@
#define READ_REGISTER_UCHAR(p) (*((volatile UCHAR *)(p))) #define WRITE_REGISTER_UCHAR(p,c) (*((volatile CHAR *)(p))) = (c)
-INT abs(INT nm) -{ - if(nm<0) - { - return nm * -1; - } else - { - return nm; - } -}
-div_t div(int num, int denom) -{ - div_t r; - if (num > 0 && denom < 0) { - num = -num; - denom = -denom; - } - r.quot = num / denom; - r.rem = num % denom; - if (num < 0 && denom > 0) - { - if (r.rem > 0) - { - r.quot++; - r.rem -= denom; - } - } - return r; -} - /*int mod(int num, int denom) { div_t dvt = div(num, denom); _____
Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h 2006-01-07 21:55:47 UTC (rev 20675) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h 2006-01-07 22:03:31 UTC (rev 20676) @@ -50,7 +50,7 @@
INT vgaGetPixel(INT x, INT y); BOOL vgaHLine(INT x, INT y, INT len, UCHAR c); BOOL vgaVLine(INT x, INT y, INT len, UCHAR c); -INT abs(INT nm); +INT __cdecl abs(INT nm); BOOL VGADDIIntersectRect(PRECTL prcDst, PRECTL prcSrc1, PRECTL prcSrc2);
#define SEQ_I 0x3C4 /* Sequencer Index */