summaryrefslogtreecommitdiffstats
path: root/base/third_party
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-29 23:24:12 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-29 23:24:12 +0000
commit87e165d66a06abe6f4cfeb6b5e575c3215ea2b0e (patch)
tree5e1f6c08951dabfdbab1a8d33ded7570d6cd5c28 /base/third_party
parent6c7b9e43327d13cda3975c51ec18870d56084b77 (diff)
downloadchromium_src-87e165d66a06abe6f4cfeb6b5e575c3215ea2b0e.zip
chromium_src-87e165d66a06abe6f4cfeb6b5e575c3215ea2b0e.tar.gz
chromium_src-87e165d66a06abe6f4cfeb6b5e575c3215ea2b0e.tar.bz2
Base: Add BASE_API to PR_ParseTimeString (for base.dll)
BUG=76996 TEST=none Review URL: http://codereview.chromium.org/6683065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79760 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/third_party')
-rw-r--r--base/third_party/nspr/prtime.cc3
-rw-r--r--base/third_party/nspr/prtime.h11
2 files changed, 10 insertions, 4 deletions
diff --git a/base/third_party/nspr/prtime.cc b/base/third_party/nspr/prtime.cc
index 65f93ee..f1fcf26 100644
--- a/base/third_party/nspr/prtime.cc
+++ b/base/third_party/nspr/prtime.cc
@@ -1,4 +1,4 @@
-/* Portions are Copyright (C) 2007 Google Inc */
+/* Portions are Copyright (C) 2011 Google Inc */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
@@ -63,6 +63,7 @@
* 3. prlong.h
*/
+#include "base/logging.h"
#include "base/third_party/nspr/prtime.h"
#include "build/build_config.h"
diff --git a/base/third_party/nspr/prtime.h b/base/third_party/nspr/prtime.h
index dd75cbc..a207021 100644
--- a/base/third_party/nspr/prtime.h
+++ b/base/third_party/nspr/prtime.h
@@ -1,4 +1,4 @@
-/* Portions are Copyright (C) 2007 Google Inc */
+/* Portions are Copyright (C) 2011 Google Inc */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
@@ -52,7 +52,7 @@
#ifndef BASE_PRTIME_H__
#define BASE_PRTIME_H__
-#include "base/logging.h"
+#include "base/base_api.h"
#include "base/third_party/nspr/prtypes.h"
#define PR_ASSERT DCHECK
@@ -225,7 +225,12 @@ NSPR_API(PRTimeParameters) PR_GMTParameters(const PRExplodedTime *gmt);
* the time string which you are parsing.
*/
-NSPR_API(PRStatus) PR_ParseTimeString (
+/*
+ * This is the only funtion that should be called from outside base, and only
+ * from the unit test.
+ */
+
+BASE_API PRStatus PR_ParseTimeString (
const char *string,
PRBool default_to_gmt,
PRTime *result);