From 5a197c4735b67f4b7d897f27dc35bcd54f6d70e1 Mon Sep 17 00:00:00 2001
From: Benjamin Smedberg <benjamin@smedbergs.us>
Date: Tue, 7 Jul 2009 12:20:02 -0400
Subject: [PATCH] Windows fixup: Windows does actually have 2-byte wchar_t.
 Also there was a possible missing PR_BEGIN_EXTERN_C that we really did need.

---
 ipc/chromium/src/base/third_party/nspr/prtime.h | 8 ++++++++
 ipc/chromium/src/build/build_config.h           | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/ipc/chromium/src/base/third_party/nspr/prtime.h b/ipc/chromium/src/base/third_party/nspr/prtime.h
index dd75cbc6b98..8b04be73d88 100644
--- a/ipc/chromium/src/base/third_party/nspr/prtime.h
+++ b/ipc/chromium/src/base/third_party/nspr/prtime.h
@@ -55,6 +55,10 @@
 #include "base/logging.h"
 #include "base/third_party/nspr/prtypes.h"
 
+#ifdef CHROMIUM_MOZILLA_BUILD
+PR_BEGIN_EXTERN_C
+#endif
+
 #define PR_ASSERT DCHECK
 
 #define LL_I2L(l, i)    ((l) = (PRInt64)(i))
@@ -230,4 +234,8 @@ NSPR_API(PRStatus) PR_ParseTimeString (
 	PRBool default_to_gmt,
 	PRTime *result);
 
+#ifdef CHROMIUM_MOZILLA_BUILD
+PR_END_EXTERN_C
+#endif
+
 #endif  // BASE_PRTIME_H__
diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h
index 66590447f7f..36f83e78730 100644
--- a/ipc/chromium/src/build/build_config.h
+++ b/ipc/chromium/src/build/build_config.h
@@ -76,7 +76,11 @@
 
 #else // CHROMIUM_MOZILLA_BUILD
 
+#if defined(OS_WIN)
+#define WCHAR_T_IS_UTF16
+#else
 #define WCHAR_T_IS_UTF32
+#endif
 
 #endif // CHROMIUM_MOZILLA_BUILD