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.

This commit is contained in:
Benjamin Smedberg 2009-07-07 12:20:02 -04:00
parent 0cf96b07ba
commit 5a197c4735
2 changed files with 12 additions and 0 deletions

View File

@ -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__

View File

@ -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