Bug 1119072, Part 14: Fix prototype of MakeCommandLine to match definition, r=rstrong
authorBrian Smith <brian@briansmith.org>
Thu, 08 Jan 2015 15:36:24 -0800
changeset 251941 3cdb06dce2b68d0c9981e42a5db498d7c9b614f1
parent 251940 63b3bb2a4963346837a5f73ac9900d46ee451bd4
child 251942 4d99239ff0f0a92f7b6ca8e2255b2cb84f910ece
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong
bugs1119072
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1119072, Part 14: Fix prototype of MakeCommandLine to match definition, r=rstrong
toolkit/components/maintenanceservice/workmonitor.cpp
--- a/toolkit/components/maintenanceservice/workmonitor.cpp
+++ b/toolkit/components/maintenanceservice/workmonitor.cpp
@@ -23,17 +23,17 @@
 #include "uachelper.h"
 #include "updatehelper.h"
 #include "errors.h"
 
 // Wait 15 minutes for an update operation to run at most.
 // Updates usually take less than a minute so this seems like a
 // significantly large and safe amount of time to wait.
 static const int TIME_TO_WAIT_ON_UPDATER = 15 * 60 * 1000;
-char16_t* MakeCommandLine(int argc, char16_t **argv);
+wchar_t* MakeCommandLine(int argc, wchar_t** argv);
 BOOL WriteStatusFailure(LPCWSTR updateDirPath, int errorCode);
 BOOL PathGetSiblingFilePath(LPWSTR destinationBuffer,  LPCWSTR siblingFilePath, 
                             LPCWSTR newFileName);
 
 /*
  * Read the update.status file and sets isApplying to true if
  * the status is set to applying.
  *