coreclr-git: Improve local patch for wchar_t redefinition

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jan 31 02:39:27 2016 +0100
Changeset:	446f5b30f73373b6b6c017692a0351a4aa7f48aa

Modified Files:
	coreclr-git/distinfo
	coreclr-git/patches/patch-src_pal_inc_pal__char16.h

Log Message:
coreclr-git: Improve local patch for wchar_t redefinition

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=446f5b30f73373b6b6c017692a0351a4aa7f48aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 coreclr-git/distinfo                                |  2 +-
 coreclr-git/patches/patch-src_pal_inc_pal__char16.h | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 969685f..5d2f1cf 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (patch-src_pal_inc_pal__char16.h) = 633049dadea21151e78a98820f1aed9949921451
+SHA1 (patch-src_pal_inc_pal__char16.h) = 205f6a8533838c192b36bbb00155da1b02e0f629
 SHA1 (patch-src_pal_src_config.h.in) = ac9fc055756c004a6dc195adf214de46d5bb2c01
 SHA1 (patch-src_pal_src_configure.cmake) = 6e348ee93672e5cd70abe189f7d621352bbfc065
 SHA1 (patch-src_pal_src_cruntime_file.cpp) = 315ad5db53ef2b893a77aa131ce97999214e0e11
diff --git a/coreclr-git/patches/patch-src_pal_inc_pal__char16.h b/coreclr-git/patches/patch-src_pal_inc_pal__char16.h
index 6c1a7ef..349876e 100644
--- a/coreclr-git/patches/patch-src_pal_inc_pal__char16.h
+++ b/coreclr-git/patches/patch-src_pal_inc_pal__char16.h
@@ -2,33 +2,28 @@ $NetBSD$
 
 --- src/pal/inc/pal_char16.h.orig	2016-01-28 19:04:13.000000000 +0000
 +++ src/pal/inc/pal_char16.h
-@@ -29,7 +29,9 @@ This file is used to define the wchar_t 
+@@ -29,6 +29,8 @@ This file is used to define the wchar_t 
  #ifndef PAL_STDCPP_COMPAT
  #if defined (PLATFORM_UNIX) && defined(__GNUC__)
  #undef wchar_t
--#define wchar_t __wchar_16_cpp__
 +#undef __WCHAR_TYPE__
 +#define __WCHAR_TYPE__ __wchar_16_cpp__
-+#define wchar_t __WCHAR_TYPE__
+ #define wchar_t __wchar_16_cpp__
  #endif // PLATFORM_UNIX
  
- // Set up the wchar_t type (which got preprocessed to __wchar_16_cpp__).
-@@ -39,9 +41,13 @@ This file is used to define the wchar_t 
+@@ -39,8 +41,12 @@ This file is used to define the wchar_t 
  #if !defined(_WCHAR_T_DEFINED) || !defined(_MSC_VER)
  #if defined (PLATFORM_UNIX)
  #if defined(__cplusplus)
--typedef char16_t wchar_t;
 +#undef __WCHAR_TYPE__
 +#define __WCHAR_TYPE__ char16_t
-+#define wchar_t __WCHAR_TYPE__
+ typedef char16_t wchar_t;
  #else
--typedef unsigned short wchar_t;
 +#undef __WCHAR_TYPE__
 +#define __WCHAR_TYPE__ unsigned short
-+#define wchar_t __WCHAR_TYPE__
+ typedef unsigned short wchar_t;
  #endif // __cplusplus
  #endif // PLATFORM_UNIX
- #ifndef _WCHAR_T_DEFINED
 @@ -49,4 +55,3 @@ typedef unsigned short wchar_t;
  #endif // !_WCHAR_T_DEFINED
  #endif // !_WCHAR_T_DEFINED || !_MSC_VER