Merging uefi-next/linaro-release into masterHEADlinaro-uefi-2014.01master

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

1 files changed, 2 insertions, 5 deletions

diff --git a/StdLib/LibC/Wchar/ConsDecons.c b/StdLib/LibC/Wchar/ConsDecons.c
index 534d3e3b0..03815f49c 100644
--- a/StdLib/LibC/Wchar/ConsDecons.c
+++ b/StdLib/LibC/Wchar/ConsDecons.c
@@ -5,7 +5,7 @@
     two wide characters the same way as two integers of the underlying integer

     type designated by wchar_t.

 

-    Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>

+    Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>

     This program and the accompanying materials are licensed and made available under

     the terms and conditions of the BSD License that accompanies this distribution.

     The full text of the license may be found at

@@ -19,7 +19,6 @@
 

 #include  <LibConfig.h>

 

-#include  <errno.h>

 #include  <wchar.h>

 

 /* Data initialized by the library constructor */

@@ -44,9 +43,7 @@ __wchar_construct(
     ASSERT(__wchar_bitmap != NULL);

     if (EFI_ERROR (Status)) {

       __wchar_bitmap = NULL;

-      EFIerrno = Status;

-      errno = ENOMEM;

-      return EFIerrno;

+      return Status;

     }

     return  RETURN_SUCCESS;

   }