From 3bc8edd575d1c99b7f3a2a7a7bb374571c30b4ca Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 22 Jun 2007 14:52:37 +0000
Subject: [PATCH] fix Sun CC warning about name clash between the method
 parameters and member variables argc/argv

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/unix/appunix.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/unix/appunix.cpp b/src/unix/appunix.cpp
index db90d98ffe..691a8a544e 100644
--- a/src/unix/appunix.cpp
+++ b/src/unix/appunix.cpp
@@ -15,9 +15,11 @@
 #include <signal.h>
 #include <unistd.h>
 
-bool wxAppConsole::Initialize(int& argc, wxChar** argv)
+// use unusual names for arg[cv] to avoid clashes with wxApp members with the
+// same names
+bool wxAppConsole::Initialize(int& argc_, wxChar** argv_)
 {
-    if ( !wxAppConsoleBase::Initialize(argc,argv) )
+    if ( !wxAppConsoleBase::Initialize(argc_, argv_) )
         return false;
 
     sigemptyset(&m_signalsCaught);
-- 
2.45.2