about:startup - fix a type warning
authorDaniel Brooks <db48x@db48x.net>
Sun, 24 Oct 2010 15:23:16 -0500
changeset 58860 6b47fb70ea30405f3b29acf4996ad06036a55732
parent 58859 4727f6e61ee658d78af0a9cf30054f44cff1e5dc
child 58861 ce8c23e52487d2c639a0d1f42f12c3399f324f94
push id17440
push userdb48x@yahoo.com
push dateWed, 08 Dec 2010 04:15:54 +0000
treeherdermozilla-central@a89f24bf1798 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b7pre
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
about:startup - fix a type warning
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -865,23 +865,23 @@ NS_IMETHODIMP nsXULAppInfo::GetLaunchTim
   char stat[512];
   memset(&stat, 0, 512);
   int n = fread(&stat, 1, 511, pidstat);
   if (n <= 0)
     return NS_ERROR_FAILURE;
   fclose(pidstat);
   PR_smprintf_free(statpath);
 
-  PRTime starttime = 0;
+  long starttime = 0;
   sscanf(strrchr(stat, ')') + 2,
          "%*c %*d %*d %*d %*d %*d %*u %*u %*u %*u "
-         "%*u %*u %*u %*u %*u %*d %*d %*d %*d %llu",
+         "%*u %*u %*u %*u %*u %*d %*d %*d %*d %lu",
          &starttime);
 
-  *aTimestamp = cached = boottime + ((starttime / tickspersecond) * PR_USEC_PER_SEC);;
+  *aTimestamp = cached = boottime + ((starttime / tickspersecond) * PR_USEC_PER_SEC);
   return NS_OK;
 #elif XP_WIN
   FILETIME start, foo, bar, baz;
   bool success = GetProcessTimes(GetCurrentProcess(), &start, &foo, &bar, &baz);
   if (success)
   {
     // copied from NSPR _PR_FileTimeToPRTime
     CopyMemory(aTimestamp, &start, sizeof(PRTime));