[Scummvm-cvs-logs] CVS: scummvm/bs2/driver driver96.h,1.1,1.2 rdwin.cpp,1.1,1.2
Max Horn
fingolfin at users.sourceforge.net
Sun Jul 27 19:11:08 CEST 2003
Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv5792/driver
Modified Files:
driver96.h rdwin.cpp
Log Message:
fixed some warnings
Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- driver96.h 28 Jul 2003 01:47:40 -0000 1.1
+++ driver96.h 28 Jul 2003 02:10:24 -0000 1.2
@@ -410,7 +410,7 @@
//
// ---------------------------------------------------------------------------
//
-// int32 ReportFatalError(uint8 *error)
+// int32 ReportFatalError(const uint8 *error)
//
// Creates a message box and displays the error string passed in, as well as
// the filename and line that the function was called from
@@ -1475,8 +1475,8 @@
//extern int32 InitialiseWindow(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow, char *gameName);
extern int32 CloseAppWindow(void);
extern int32 ServiceWindows(void);
-extern int32 _ReportDriverError(int32 error, uint8 *filename, uint32 line);
-extern int32 _ReportFatalError(uint8 *error, uint8 *filename, uint32 line);
+extern int32 _ReportDriverError(int32 error, const uint8 *filename, uint32 line);
+extern int32 _ReportFatalError(const uint8 *error, const uint8 *filename, uint32 line);
extern int32 DisableQuitKey(void);
extern void SetWindowName(const char *windowName);
//-----------------------------------------------------------------------------
@@ -1622,8 +1622,8 @@
//-----------------------------------------------------------------------------
//Macro for calling error handler with source filename and line.
//-----------------------------------------------------------------------------
-#define ReportDriverError(f) _ReportDriverError(f, (uint8 *) __FILE__, (uint32) __LINE__)
-#define ReportFatalError(f) _ReportFatalError(f, (uint8 *) __FILE__, (uint32) __LINE__)
+#define ReportDriverError(f) _ReportDriverError(f, (const uint8 *) __FILE__, (uint32) __LINE__)
+#define ReportFatalError(f) _ReportFatalError(f, (const uint8 *) __FILE__, (uint32) __LINE__)
//-----------------------------------------------------------------------------
Index: rdwin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/rdwin.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rdwin.cpp 28 Jul 2003 01:47:41 -0000 1.1
+++ rdwin.cpp 28 Jul 2003 02:10:24 -0000 1.2
@@ -574,10 +574,10 @@
-int32 _ReportDriverError(int32 error, uint8 *filename, uint32 line)
+int32 _ReportDriverError(int32 error, const uint8 *filename, uint32 line)
{
- warning("stub _ReportDriverError 0x%.8x file: %s, line: %d ", error, (char *) filename, line);
+ warning("stub _ReportDriverError 0x%.8x file: %s, line: %d ", error, (const char *) filename, line);
/*
char errorText[128];
@@ -594,7 +594,7 @@
-int32 _ReportFatalError(uint8 *error, uint8 *filename, uint32 line)
+int32 _ReportFatalError(const uint8 *error, const uint8 *filename, uint32 line)
{
More information about the Scummvm-git-logs
mailing list