2016-01-12 02:38:10 +00:00
|
|
|
diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/base.gypi qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi
|
|
|
|
|
--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/base.gypi 2015-12-10 18:17:21.000000000 +0100
|
|
|
|
|
+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi 2016-01-12 03:01:20.875004550 +0100
|
|
|
|
|
@@ -623,8 +623,6 @@
|
|
|
|
|
'third_party/dmg_fp/g_fmt.cc',
|
|
|
|
|
'third_party/icu/icu_utf.cc',
|
|
|
|
|
'third_party/icu/icu_utf.h',
|
|
|
|
|
- 'third_party/nspr/prtime.cc',
|
|
|
|
|
- 'third_party/nspr/prtime.h',
|
|
|
|
|
'third_party/superfasthash/superfasthash.c',
|
|
|
|
|
'third_party/xdg_mime/xdgmime.h',
|
|
|
|
|
'thread_task_runner_handle.cc',
|
|
|
|
|
diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/BUILD.gn qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn
|
|
|
|
|
--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/BUILD.gn 2015-12-10 18:17:21.000000000 +0100
|
|
|
|
|
+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn 2016-01-12 03:03:08.040591492 +0100
|
|
|
|
|
@@ -506,8 +506,6 @@
|
|
|
|
|
"third_party/dmg_fp/g_fmt.cc",
|
|
|
|
|
"third_party/icu/icu_utf.cc",
|
|
|
|
|
"third_party/icu/icu_utf.h",
|
|
|
|
|
- "third_party/nspr/prtime.cc",
|
|
|
|
|
- "third_party/nspr/prtime.h",
|
|
|
|
|
"third_party/superfasthash/superfasthash.c",
|
|
|
|
|
"thread_task_runner_handle.cc",
|
|
|
|
|
"thread_task_runner_handle.h",
|
|
|
|
|
diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/pr_time_unittest.cc qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/pr_time_unittest.cc
|
|
|
|
|
--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/pr_time_unittest.cc 2015-12-10 18:17:21.000000000 +0100
|
|
|
|
|
+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/pr_time_unittest.cc 2016-01-12 03:01:20.876004555 +0100
|
|
|
|
|
@@ -6,7 +6,7 @@
|
|
|
|
|
#include <time.h>
|
|
|
|
|
|
|
|
|
|
#include "base/compiler_specific.h"
|
|
|
|
|
-#include "base/third_party/nspr/prtime.h"
|
2016-01-12 03:10:50 +00:00
|
|
|
+#include <nspr4/prtime.h>
|
2016-01-12 02:38:10 +00:00
|
|
|
#include "base/time/time.h"
|
|
|
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
|
|
|
|
|
|
|
|
diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/time.cc qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/time.cc
|
|
|
|
|
--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/base/time/time.cc 2015-12-10 18:17:21.000000000 +0100
|
|
|
|
|
+++ qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime/src/3rdparty/chromium/base/time/time.cc 2016-01-12 03:01:20.877004561 +0100
|
|
|
|
|
@@ -13,7 +13,8 @@
|
|
|
|
|
#include "base/lazy_instance.h"
|
|
|
|
|
#include "base/logging.h"
|
|
|
|
|
#include "base/strings/stringprintf.h"
|
|
|
|
|
-#include "base/third_party/nspr/prtime.h"
|
|
|
|
|
+
|
2016-01-12 03:10:50 +00:00
|
|
|
+#include <nspr4/prtime.h>
|
2016-01-12 02:38:10 +00:00
|
|
|
|
|
|
|
|
namespace base {
|
|
|
|
|
|
