summaryrefslogtreecommitdiffstats
path: root/base/third_party
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-29 00:32:52 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-29 00:32:52 +0000
commite43eddf1a5887c4b249af3daa024c1107ce254a1 (patch)
tree994df09c627978ef3fb93a9fadebd00bebbcb31d /base/third_party
parenta672cb9dce10306f3b149802653dbb554b326a44 (diff)
downloadchromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.zip
chromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.tar.gz
chromium_src-e43eddf1a5887c4b249af3daa024c1107ce254a1.tar.bz2
Changes to base/ from a combination of FreeBSD and OpenBSD patches.
Review URL: http://codereview.chromium.org/495002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/third_party')
-rw-r--r--base/third_party/nspr/prtime.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/third_party/nspr/prtime.cc b/base/third_party/nspr/prtime.cc
index 2407884..65f93ee 100644
--- a/base/third_party/nspr/prtime.cc
+++ b/base/third_party/nspr/prtime.cc
@@ -149,7 +149,7 @@ PR_ImplodeTime(const PRExplodedTime *exploded)
result *= kSecondsToMicroseconds;
result += exploded->tm_usec;
return result;
-#elif defined(OS_LINUX) || defined(OS_FREEBSD)
+#elif defined(OS_POSIX)
struct tm exp_tm = {0};
exp_tm.tm_sec = exploded->tm_sec;
exp_tm.tm_min = exploded->tm_min;