aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Comstedt2009-03-21 16:07:46 +0000
committerMarcus Comstedt2009-03-21 16:07:46 +0000
commitbce96bd55d3745858bfd50fe41cb022ff1a9fac5 (patch)
tree820283270a54e5f64d5957b8d1b06d7de87b35bf
parente3ca4afb595e63e1acfabd2c6e5de75ec6461e07 (diff)
downloadscummvm-rg350-bce96bd55d3745858bfd50fe41cb022ff1a9fac5.tar.gz
scummvm-rg350-bce96bd55d3745858bfd50fe41cb022ff1a9fac5.tar.bz2
scummvm-rg350-bce96bd55d3745858bfd50fe41cb022ff1a9fac5.zip
argv should not be modified; make it plenty const.
svn-id: r39591
-rw-r--r--backends/platform/dc/dcmain.cpp2
-rw-r--r--base/commandLine.cpp4
-rw-r--r--base/commandLine.h2
-rw-r--r--base/main.cpp2
-rw-r--r--base/main.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index b32ee53131..7a0f71ad1a 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -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;
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index da1ca25f58..998c96dedf 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -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();
}
diff --git a/base/commandLine.h b/base/commandLine.h
index 794e08b651..8801ed17d8 100644
--- a/base/commandLine.h
+++ b/base/commandLine.h
@@ -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
diff --git a/base/main.cpp b/base/main.cpp
index 46489649ae..cdc8ddd73c 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -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;
diff --git a/base/main.h b/base/main.h
index decdaa1c27..93e73f55e6 100644
--- a/base/main.h
+++ b/base/main.h
@@ -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