Upstream misc changes for android.

base/third_party/nspr/prtime.cc

 /* Portions are Copyright (C) 2011 Google Inc */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 53 matching lines @@
  */
 
 #include "base/logging.h"
 #include "base/third_party/nspr/prtime.h"
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_MACOSX)
 #include <CoreFoundation/CoreFoundation.h>
+#elif defined(OS_ANDROID)
+#include <ctype.h>
+#include "base/time.h"  // For timegm()

[brettw, 2011/08/24 23:17:13]

I don't think you actually updated this like you said you did. Maybe you forgot
to upload?

[michaelbai, 2011/08/25 17:26:16]

Here it is, thanks

 #endif
 #include <errno.h>  /* for EINVAL */
 #include <time.h>
 
 /* Implements the Unix localtime_r() function for windows */
 #if defined(OS_WIN)
 static void localtime_r(const time_t* secs, struct tm* time) {
   (void) localtime_s(time, secs);
 }
 #endif
@@ skipping 47 matching lines @@
 #elif defined(OS_MACOSX)
     // Create the system struct representing our exploded time.
     CFGregorianDate gregorian_date;
     gregorian_date.year = exploded->tm_year;
     gregorian_date.month = exploded->tm_month + 1;
     gregorian_date.day = exploded->tm_mday;
     gregorian_date.hour = exploded->tm_hour;
     gregorian_date.minute = exploded->tm_min;
     gregorian_date.second = exploded->tm_sec;
 
-    // Compute |absolute_time| in seconds, correct for gmt and dst 
+    // Compute |absolute_time| in seconds, correct for gmt and dst
     // (note the combined offset will be negative when we need to add it), then
     // convert to microseconds which is what PRTime expects.
-    CFAbsoluteTime absolute_time = 
+    CFAbsoluteTime absolute_time =
         CFGregorianDateGetAbsoluteTime(gregorian_date, NULL);
     PRTime result = static_cast<PRTime>(absolute_time);
     result -= exploded->tm_params.tp_gmt_offset +
               exploded->tm_params.tp_dst_offset;
     result += kCFAbsoluteTimeIntervalSince1970;  // PRTime epoch is 1970
     result *= kSecondsToMicroseconds;
     result += exploded->tm_usec;
     return result;
 #elif defined(OS_POSIX)
     struct tm exp_tm = {0};
@@ skipping 1040 matching lines @@
                               + 60 * localTime.tm_hour
                               + 1440 * (localTime.tm_mday - 2);
         }
 
   result->tm_params.tp_gmt_offset = zone_offset * 60;
   result->tm_params.tp_dst_offset = dst_offset * 60;
 
   *result_imploded = PR_ImplodeTime(result);
   return PR_SUCCESS;
 }