thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

argv should not be modified; make it plenty const.

Browse source 
svn-id: r39591
This commit is contained in:
Marcus Comstedt 2009-03-21 16:07:46 +00:00
parent e3ca4afb59
commit bce96bd55d
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/platform/dc/dcmain.cpp
View file

@ -217,7 +217,7 @@ static OSystem_Dreamcast osys_dc;
int main()
{
static char *argv[] = { "scummvm", NULL, };
static const char *argv[] = { "scummvm", NULL, };
static int argc = 1;
g_system = &osys_dc;

4
base/commandLine.cpp
View file

@ -281,7 +281,7 @@ void registerDefaults() {
}
Common::String parseCommandLine(Common::StringMap &settings, int argc, char **argv) {
Common::String parseCommandLine(Common::StringMap &settings, int argc, const char * const *argv) {
const char *s, *s2;
// argv[0] contains the name of the executable.
@ -710,7 +710,7 @@ static void runDetectorTest() {
#else // DISABLE_COMMAND_LINE
Common::String parseCommandLine(Common::StringMap &settings, int argc, char **argv) {
Common::String parseCommandLine(Common::StringMap &settings, int argc, const char * const *argv) {
return Common::String();
}

2
base/commandLine.h
View file

@ -32,7 +32,7 @@
namespace Base {
void registerDefaults();
Common::String parseCommandLine(Common::StringMap &settings, int argc, char **argv);
Common::String parseCommandLine(Common::StringMap &settings, int argc, const char * const *argv);
bool processSettings(Common::String &command, Common::StringMap &settings);
} // End of namespace Base

2
base/main.cpp
View file

@ -235,7 +235,7 @@ static void setupGraphics(OSystem &system) {
}
extern "C" int scummvm_main(int argc, char *argv[]) {
extern "C" int scummvm_main(int argc, const char * const argv[]) {
Common::String specialDebug;
Common::String command;

2
base/main.h
View file

@ -31,6 +31,6 @@
//
// The scummvm main entry point, to be invoked by ports
//
extern "C" int scummvm_main(int argc, char *argv[]);
extern "C" int scummvm_main(int argc, const char * const argv[]);
#endif