Author: weiden Date: Mon Oct 9 18:43:16 2006 New Revision: 24468
URL: http://svn.reactos.org/svn/reactos?rev=24468&view=rev Log: Strings should be const char *. Fixes compilation with GCC4
Modified: trunk/reactos/drivers/base/bootvid/bootvid.h trunk/reactos/drivers/base/bootvid/vid.c trunk/reactos/drivers/base/bootvid/vid_vga.c trunk/reactos/drivers/base/bootvid/vid_vgatext.c trunk/reactos/drivers/base/bootvid/vid_xbox.c
Modified: trunk/reactos/drivers/base/bootvid/bootvid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootvi... ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.h (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.h Mon Oct 9 18:43:16 2006 @@ -39,7 +39,7 @@ VOID NTAPI VidScreenToBufferBlt(PUCHAR, ULONG, ULONG, ULONG, ULONG, ULONG); VOID NTAPI VidBitBlt(PUCHAR, ULONG, ULONG); VOID NTAPI VidSolidColorFill(ULONG, ULONG, ULONG, ULONG, ULONG); -VOID NTAPI VidDisplayString(PUCHAR); +VOID NTAPI VidDisplayString(PCSTR);
typedef BOOLEAN (NTAPI *PVID_INITIALIZE)(BOOLEAN); typedef VOID (NTAPI *PVID_CLEAN_UP)(VOID); @@ -48,7 +48,7 @@ typedef VOID (NTAPI *PVID_SCREEN_TO_BUFFER_BLT)(PUCHAR, ULONG, ULONG, ULONG, ULONG, ULONG); typedef VOID (NTAPI *PVID_BITBLT)(PUCHAR, ULONG, ULONG); typedef VOID (NTAPI *PVID_SOLID_COLOR_FILL)(ULONG, ULONG, ULONG, ULONG, ULONG); -typedef VOID (NTAPI *PVID_DISPLAY_STRING)(PUCHAR); +typedef VOID (NTAPI *PVID_DISPLAY_STRING)(PCSTR);
typedef struct _VID_FUNCTION_TABLE {
Modified: trunk/reactos/drivers/base/bootvid/vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid.c?... ============================================================================== --- trunk/reactos/drivers/base/bootvid/vid.c (original) +++ trunk/reactos/drivers/base/bootvid/vid.c Mon Oct 9 18:43:16 2006 @@ -113,7 +113,7 @@
VOID NTAPI VidDisplayString( - IN PUCHAR String) + IN PCSTR String) { VidTable->DisplayString(String); }
Modified: trunk/reactos/drivers/base/bootvid/vid_vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_vg... ============================================================================== --- trunk/reactos/drivers/base/bootvid/vid_vga.c (original) +++ trunk/reactos/drivers/base/bootvid/vid_vga.c Mon Oct 9 18:43:16 2006 @@ -495,7 +495,7 @@
static VOID NTAPI VidVgaDisplayString( - IN PUCHAR String) + IN PCSTR String) { }
Modified: trunk/reactos/drivers/base/bootvid/vid_vgatext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_vg... ============================================================================== --- trunk/reactos/drivers/base/bootvid/vid_vgatext.c (original) +++ trunk/reactos/drivers/base/bootvid/vid_vgatext.c Mon Oct 9 18:43:16 2006 @@ -179,9 +179,9 @@
static VOID NTAPI VidVgaTextDisplayString( - IN PUCHAR String) -{ - PCH pch; + IN PCSTR String) +{ + PCSTR pch; int offset; ULONG CursorX; ULONG CursorY;
Modified: trunk/reactos/drivers/base/bootvid/vid_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_xb... ============================================================================== --- trunk/reactos/drivers/base/bootvid/vid_xbox.c (original) +++ trunk/reactos/drivers/base/bootvid/vid_xbox.c Mon Oct 9 18:43:16 2006 @@ -85,7 +85,7 @@
static VOID NTAPI VidXboxDisplayString( - IN PUCHAR String) + IN PCSTR String) { }