aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2010-06-25 11:24:27 +0000
committerAdam Tkac <atkac@redhat.com>2010-06-25 11:24:27 +0000
commit8fb6ac0e9909417b9cddaf93ca9840dd7bbe1ce1 (patch)
tree50658e653fa483d62de06d3eac289f7a69aa2cee
parente450dc442ee54f04a2b23716aacdde2b903271af (diff)
downloadtigervnc-8fb6ac0e9909417b9cddaf93ca9840dd7bbe1ce1.tar.gz
tigervnc-8fb6ac0e9909417b9cddaf93ca9840dd7bbe1ce1.zip
winvnc: Declare argv as "char**" instead of "const *char[]"
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4073 3789f03b-4d11-0410-bbf8-ca57d06f2519
-rw-r--r--win/rfb_win32/Service.cxx2
-rw-r--r--win/rfb_win32/Service.h2
-rw-r--r--win/winvnc/winvnc.cxx4
3 files changed, 4 insertions, 4 deletions
diff --git a/win/rfb_win32/Service.cxx b/win/rfb_win32/Service.cxx
index 2547277e..982a5b36 100644
--- a/win/rfb_win32/Service.cxx
+++ b/win/rfb_win32/Service.cxx
@@ -384,7 +384,7 @@ bool rfb::win32::initEventLogLogger(const TCHAR* srcname) {
// -=- Registering and unregistering the service
bool rfb::win32::registerService(const TCHAR* name, const TCHAR* desc,
- int argc, const char* argv[]) {
+ int argc, char** argv) {
// - Initialise the default service parameters
const TCHAR* defaultcmdline;
diff --git a/win/rfb_win32/Service.h b/win/rfb_win32/Service.h
index 00abe108..198726ce 100644
--- a/win/rfb_win32/Service.h
+++ b/win/rfb_win32/Service.h
@@ -105,7 +105,7 @@ namespace rfb {
// event source information, etc.
// *** should really accept TCHAR argv
- bool registerService(const TCHAR* name, const TCHAR* desc, int argc, const char* argv[]);
+ bool registerService(const TCHAR* name, const TCHAR* desc, int argc, char** argv);
bool unregisterService(const TCHAR* name);
bool startService(const TCHAR* name);
diff --git a/win/winvnc/winvnc.cxx b/win/winvnc/winvnc.cxx
index 73baf6e8..63d8b4e8 100644
--- a/win/winvnc/winvnc.cxx
+++ b/win/winvnc/winvnc.cxx
@@ -99,7 +99,7 @@ static void MsgBoxOrLog(const char* msg, bool isError=false) {
}
}
-static void processParams(int argc, const char* argv[]) {
+static void processParams(int argc, char** argv) {
for (int i=1; i<argc; i++) {
try {
@@ -218,7 +218,7 @@ static void processParams(int argc, const char* argv[]) {
// -=- main
//
-int main(int argc, const char* argv[]) {
+int main(int argc, char** argv) {
int result = 0;
try {