Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: compat/win/time.h

Issue 1357833002: win: Get Crashpad compiling under VS2015 (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: include Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « compat/win/sys/types.h ('k') | minidump/minidump_file_writer_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compat/win/time.h
diff --git a/compat/win/time.h b/compat/win/time.h
index 7c6adc2ce8dfe8f21b2c5fa7cef828016f3c8d22..913b4694abaca736344b800b92ac15c0ad56d489 100644
--- a/compat/win/time.h
+++ b/compat/win/time.h
@@ -15,7 +15,12 @@
#ifndef CRASHPAD_COMPAT_WIN_TIME_H_
#define CRASHPAD_COMPAT_WIN_TIME_H_
+// This is intended to be roughly equivalent to #include_next.
+#if _MSC_VER < 1900
#include <../include/time.h>
+#else
+#include <../ucrt/time.h>
+#endif
#ifdef __cplusplus
extern "C" {
« no previous file with comments | « compat/win/sys/types.h ('k') | minidump/minidump_file_writer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698