From 1721a0b69373a06a61934570a656e81075865752 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sat, 24 Sep 2011 11:28:16 +0200
Subject: [PATCH] * Some more Windows-related Breakpad fixes.

---
 src/breakpad/BreakPad.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/breakpad/BreakPad.cpp b/src/breakpad/BreakPad.cpp
index d6721da75..1d5d9360b 100644
--- a/src/breakpad/BreakPad.cpp
+++ b/src/breakpad/BreakPad.cpp
@@ -96,8 +96,8 @@ LaunchUploader( const wchar_t* dump_dir, const wchar_t* minidump_id, void* that,
     const char* productName = static_cast<BreakPad*>(that)->productName();
 
     // convert productName to widechars, which sadly means the product name must be Latin1
-    wchar_t productName[ 256 ];
-    char* out = (char*)product_name;
+    wchar_t wcProductName[ 256 ];
+    char* out = (char*)wcProductName;
     const char* in = productName - 1;
     do {
         *out++ = *++in; //latin1 chars fit in first byte of each wchar
@@ -111,19 +111,19 @@ LaunchUploader( const wchar_t* dump_dir, const wchar_t* minidump_id, void* that,
     wcscat( command, L"\" \"" );
     wcscat( command, minidump_id );
     wcscat( command, L"\" \"" );
-    wcscat( command, product_name );
+    wcscat( command, wcProductName );
     wcscat( command, L"\"" );
 
     STARTUPINFO si;
     PROCESS_INFORMATION pi;
 
     ZeroMemory( &si, sizeof( si ) );
-    si.cb = sizeof(si);
+    si.cb = sizeof( si );
     si.dwFlags = STARTF_USESHOWWINDOW;
     si.wShowWindow = SW_SHOWNORMAL;
-    ZeroMemory( &pi, sizeof(pi) );
+    ZeroMemory( &pi, sizeof( pi ) );
 
-    if (CreateProcess( NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
+    if ( CreateProcess( NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ) )
     {
         CloseHandle( pi.hProcess );
         CloseHandle( pi.hThread );