From 556459f022d68ddd6ad87e68aef63c2dc52a8a43 Mon Sep 17 00:00:00 2001
From: Du Huanpeng <u74147@gmail.com>
Date: Wed, 13 Apr 2016 20:35:18 +0800
Subject: wchar_t: wchar_t should go to stddef.h

according to C99 standard, the definition of wchar_t
should go stddef.h
this patch also remove wchar_t local definition and
use stddef.h instead.

Signed-off-by: Du Huanpeng <u74147@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 fs/efi.c               | 3 +--
 include/linux/stddef.h | 2 ++
 include/wchar.h        | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/efi.c b/fs/efi.c
index 0f74cdafff..83c46826d5 100644
--- a/fs/efi.c
+++ b/fs/efi.c
@@ -32,6 +32,7 @@
 #include <efi.h>
 #include <mach/efi.h>
 #include <mach/efi-device.h>
+#include <linux/stddef.h>
 
 /* Open modes */
 #define EFI_FILE_MODE_READ      0x0000000000000001
@@ -92,8 +93,6 @@ struct efi_file_info {
 	s16 FileName[1];
 };
 
-typedef unsigned short wchar_t;
-
 struct efifs_priv {
 	struct efi_file_handle *root_dir;
 	struct efi_file_io_interface *protocol;
diff --git a/include/linux/stddef.h b/include/linux/stddef.h
index e36632872d..680d0c7662 100644
--- a/include/linux/stddef.h
+++ b/include/linux/stddef.h
@@ -17,6 +17,8 @@ enum {
 #include <linux/types.h>
 #endif
 
+typedef unsigned short wchar_t;
+
 #undef offsetof
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 
diff --git a/include/wchar.h b/include/wchar.h
index 702d8e239a..adb4f373e9 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -2,8 +2,7 @@
 #define __WCHAR_H
 
 #include <linux/types.h>
-
-typedef u16 wchar_t;
+#include <linux/stddef.h>
 
 wchar_t *strdup_wchar(const wchar_t *src);
 
-- 
cgit v1.2.3