From 1eb09f3eb26fda104ba645169562fa25263c15ab Mon Sep 17 00:00:00 2001
From: Konrad Borowski <glitchmr@myopera.com>
Date: Wed, 27 Nov 2013 21:10:28 +0100
Subject: [PATCH] Fix compilation failures under Intel C compiler.

It appears that Intel C compiler doesn't recognize unsigned wchar_t,
however it doesn't appear to be important (the conversion function is
unused, and in other cases it doesn't appear to be needed).
---
 builtin_printf.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/builtin_printf.cpp b/builtin_printf.cpp
index b7df7fa82..7e7daee23 100644
--- a/builtin_printf.cpp
+++ b/builtin_printf.cpp
@@ -195,11 +195,6 @@ double C_STRTOD(wchar_t const *nptr, wchar_t **endptr)
     return r;
 }
 
-static inline unsigned wchar_t to_uwchar_t(wchar_t ch)
-{
-    return ch;
-}
-
 void builtin_printf_state_t::fatal_error(const wchar_t *fmt, ...)
 {
     // Don't error twice
@@ -292,7 +287,7 @@ static T string_to_scalar_type(const wchar_t *s, builtin_printf_state_t *state)
     T val;
     if (*s == L'\"' || *s == L'\'')
     {
-        unsigned wchar_t ch = *++s;
+        wchar_t ch = *++s;
         val = ch;
     }
     else
@@ -736,7 +731,7 @@ no_more_flag_characters:
                     ++f;
 
                 {
-                    unsigned wchar_t conversion = *f;
+                    wchar_t conversion = *f;
                     if (! ok[conversion])
                     {
                         this->fatal_error(_(L"%.*ls: invalid conversion specification"), (int)(f + 1 - direc_start), direc_start);