diff options
| author | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 22:28:24 +0000 |
|---|---|---|
| committer | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 22:28:24 +0000 |
| commit | 05b5d79a30242f87e42ab83f73d8eaa6031ec1ab (patch) | |
| tree | b80969693cf475beb44c2b1b47a23e960264c687 /base/command_line.cc | |
| parent | dc710506a72d2eba31c3a1ad2f8f161871b7d87a (diff) | |
| download | chromium_src-05b5d79a30242f87e42ab83f73d8eaa6031ec1ab.zip chromium_src-05b5d79a30242f87e42ab83f73d8eaa6031ec1ab.tar.gz chromium_src-05b5d79a30242f87e42ab83f73d8eaa6031ec1ab.tar.bz2 | |
Fix an accidental nested extern and conversion cleanup from brett's landing.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@541 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/command_line.cc')
| -rw-r--r-- | base/command_line.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/command_line.cc b/base/command_line.cc index a142f95..0649ee8 100644 --- a/base/command_line.cc +++ b/base/command_line.cc @@ -39,15 +39,15 @@ #include "base/logging.h" #include "base/singleton.h" #include "base/string_util.h" +#include "base/sys_string_conversions.h" extern "C" { #if defined(OS_MACOSX) const char** NXArgv; int NXArgc; #elif defined(OS_LINUX) -extern "C" { const char** __libc_argv; -int __libc_argv; +int __libc_argc; #endif } // extern "C" @@ -142,11 +142,11 @@ class CommandLine::Data { if (argc <= 1) return; - program_ = NativeMBToWide(argv[0]); + program_ = base::SysNativeMBToWide(argv[0]); command_line_string_ = program_; for (int i = 1; i < argc; ++i) { - std::wstring arg = NativeMBToWide(argv[i]); + std::wstring arg = base::SysNativeMBToWide(argv[i]); command_line_string_.append(L" "); command_line_string_.append(arg); |