From 75b919f102eac464b86769716426a65b8622afa4 Mon Sep 17 00:00:00 2001 From: arvinzzz Date: Mon, 25 Jul 2022 17:45:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20iccarm=E5=BD=A2=E6=80=81=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=B7=A5=E5=85=B7=E9=93=BEFILE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E4=BD=93=EF=BC=8C=E4=B8=8D=E4=BD=BF=E7=94=A8musl=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=88=86=E6=94=AF=20close:=20#I5ISHP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: arvinzzz Change-Id: Ia031b6e836a78108e2dd992135cda3d406577ee0 --- .../kernel/include/bits/alltypes.h | 36 ------------------- porting/liteos_m_iccarm/kernel/include/grp.h | 5 ++- .../liteos_m_iccarm/kernel/include/mntent.h | 3 +- porting/liteos_m_iccarm/kernel/include/pwd.h | 6 ++-- .../liteos_m_iccarm/kernel/include/shadow.h | 2 +- 5 files changed, 7 insertions(+), 45 deletions(-) diff --git a/porting/liteos_m_iccarm/kernel/include/bits/alltypes.h b/porting/liteos_m_iccarm/kernel/include/bits/alltypes.h index f195847b..77e0d734 100644 --- a/porting/liteos_m_iccarm/kernel/include/bits/alltypes.h +++ b/porting/liteos_m_iccarm/kernel/include/bits/alltypes.h @@ -307,42 +307,6 @@ typedef struct { unsigned __attr[2]; } pthread_rwlockattr_t; #define __DEFINED_pthread_rwlockattr_t #endif - -#if defined(__NEED_struct__IO_FILE) && !defined(__DEFINED_struct__IO_FILE) -struct _IO_FILE { - unsigned flags; - unsigned char *rpos, *rend; - int (*close)(struct _IO_FILE *); - unsigned char *wend, *wpos; - unsigned char *mustbezero_1; - unsigned char *wbase; - size_t (*read)(struct _IO_FILE *, unsigned char *, size_t); - size_t (*write)(struct _IO_FILE *, const unsigned char *, size_t); - off_t (*seek)(struct _IO_FILE *, off_t, int); - unsigned char *buf; - size_t buf_size; - struct _IO_FILE *prev, *next; - int fd; - int pipe_pid; - int mode; - void *lock; - int lbf; - void *cookie; - off_t off; - char *getln_buf; - void *mustbezero_2; - unsigned char *shend; - off_t shlim, shcnt; - struct __locale_struct *locale; -}; -#define __DEFINED_struct__IO_FILE -#endif - -#if defined(__NEED_FILE) && !defined(__DEFINED_FILE) -typedef struct _IO_FILE FILE; -#define __DEFINED_FILE -#endif - #if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list) typedef __builtin_va_list __isoc_va_list; #define __DEFINED___isoc_va_list diff --git a/porting/liteos_m_iccarm/kernel/include/grp.h b/porting/liteos_m_iccarm/kernel/include/grp.h index 27e8c5e6..62866bc0 100644 --- a/porting/liteos_m_iccarm/kernel/include/grp.h +++ b/porting/liteos_m_iccarm/kernel/include/grp.h @@ -10,12 +10,11 @@ extern "C" { #define __NEED_size_t #define __NEED_gid_t +#include #ifdef _GNU_SOURCE -#define __NEED_FILE +#include #endif -#include - struct group { char *gr_name; char *gr_passwd; diff --git a/porting/liteos_m_iccarm/kernel/include/mntent.h b/porting/liteos_m_iccarm/kernel/include/mntent.h index 3492a1d6..6fe92107 100644 --- a/porting/liteos_m_iccarm/kernel/include/mntent.h +++ b/porting/liteos_m_iccarm/kernel/include/mntent.h @@ -5,8 +5,7 @@ extern "C" { #endif -#define __NEED_FILE -#include +#include #define MOUNTED "/etc/mtab" diff --git a/porting/liteos_m_iccarm/kernel/include/pwd.h b/porting/liteos_m_iccarm/kernel/include/pwd.h index 4f470b55..dcd190fd 100644 --- a/porting/liteos_m_iccarm/kernel/include/pwd.h +++ b/porting/liteos_m_iccarm/kernel/include/pwd.h @@ -11,12 +11,12 @@ extern "C" { #define __NEED_uid_t #define __NEED_gid_t +#include + #ifdef _GNU_SOURCE -#define __NEED_FILE +#include #endif -#include - struct passwd { char *pw_name; char *pw_passwd; diff --git a/porting/liteos_m_iccarm/kernel/include/shadow.h b/porting/liteos_m_iccarm/kernel/include/shadow.h index 2b1be413..7a26af44 100644 --- a/porting/liteos_m_iccarm/kernel/include/shadow.h +++ b/porting/liteos_m_iccarm/kernel/include/shadow.h @@ -5,10 +5,10 @@ extern "C" { #endif -#define __NEED_FILE #define __NEED_size_t #include +#include #define SHADOW "/etc/shadow" -- GitLab