remove libc_errno.h & libc_limits.h

This commit is contained in:
Meco Man 2021-05-22 02:50:35 +08:00
parent 126af8e43c
commit a5f7635f31
20 changed files with 27 additions and 57 deletions

View File

@ -15,7 +15,7 @@
#ifdef RT_USING_LIBC
#include <sys/types.h>
#endif
#include <sys/errno.h>
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -5,18 +5,10 @@
*
* Change Logs:
* Date Author Notes
* 2016-11-12 Bernard The first version
* 2021-05-22 Meco Man The first version.
*/
#ifndef LIBC_ERRNO_H__
#define LIBC_ERRNO_H__
#include <rtconfig.h>
#if defined(RT_USING_NEWLIB) || defined(_WIN32) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
/* use errno.h file in toolchains */
#include <errno.h>
#endif
#ifndef _SYS_ERRNO_H
#define _SYS_ERRNO_H
#if defined(__CC_ARM)
/*
@ -29,6 +21,7 @@ defined in armcc/errno.h
#define EINVAL 5
#define ENOMEM 6
*/
#define ERROR_BASE_NO 7
#elif defined(__IAR_SYSTEMS_ICC__)
@ -41,11 +34,12 @@ defined in armcc/errno.h
#define ERROR_BASE_NO 36
#else
#define ERROR_BASE_NO 0
#endif
#if !defined(RT_USING_NEWLIB) && !defined(_WIN32) && !(defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
#if !defined(_WIN32)
#include <errno.h>
#define EPERM (ERROR_BASE_NO + 1)
#define ENOENT (ERROR_BASE_NO + 2)
@ -200,7 +194,6 @@ defined in armcc/errno.h
#define ENOTRECOVERABLE (ERROR_BASE_NO + 131)
#define ERFKILL (ERROR_BASE_NO + 132)
#define EHWPOISON (ERROR_BASE_NO + 133)
#endif
#endif

View File

@ -21,6 +21,7 @@
*/
#include "sys/time.h"
#include <sys/errno.h>
#include <rtthread.h>
#ifdef RT_USING_DEVICE

View File

@ -11,8 +11,8 @@
#include "posix_getline.h"
#include <stdlib.h>
#include <errno.h>
#include <rtlibc.h>
#include <limits.h>
#include <sys/errno.h>
ssize_t getdelim(char **lineptr, size_t *n, int delim, FILE *stream) {
char *cur_pos, *new_lineptr;
@ -43,7 +43,7 @@ ssize_t getdelim(char **lineptr, size_t *n, int delim, FILE *stream) {
break;
if ((*lineptr + *n - cur_pos) < 2) {
if (SSIZE_MAX / 2 < *n) {
if (LONG_MAX / 2 < *n) {
#ifdef EOVERFLOW
errno = EOVERFLOW;
#else

View File

@ -20,7 +20,7 @@
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
#include <errno.h>
#include <sys/errno.h>
#include <fcntl.h>
#endif

View File

@ -11,7 +11,7 @@
#include <string.h>
#include <rtthread.h>
#include <dfs_posix.h>
#include <sys/errno.h>
#include <termios.h>
int tcgetattr(int fd, struct termios *tio)

View File

@ -105,7 +105,7 @@ void sys_arch_assert(const char* file, int line);
#define LWIP_PLATFORM_DIAG(x) do {rt_kprintf x;} while(0)
#define LWIP_PLATFORM_ASSERT(x) do {rt_kprintf(x); sys_arch_assert(__FILE__, __LINE__);}while(0)
#include "string.h"
#include <string.h>
#define SYS_ARCH_DECL_PROTECT(level)
#define SYS_ARCH_PROTECT(level) rt_enter_critical()

View File

@ -84,7 +84,7 @@ void sys_arch_assert(const char* file, int line);
#define LWIP_PLATFORM_DIAG(x) do {rt_kprintf x;} while(0)
#define LWIP_PLATFORM_ASSERT(x) do {rt_kprintf(x); sys_arch_assert(__FILE__, __LINE__);}while(0)
#include "string.h"
#include <string.h>
#define SYS_ARCH_DECL_PROTECT(level)
#define SYS_ARCH_PROTECT(level) rt_enter_critical()

View File

@ -5,6 +5,8 @@
#define ERRNO 1
#define LWIP_ERRNO_STDINCLUDE
#define LWIP_IPV4 1
#ifdef RT_USING_LWIP_IPV6

View File

@ -46,7 +46,7 @@
#define X32_F "lx"
#ifdef RT_USING_LIBC
#include <errno.h>
#include <sys/errno.h>
#ifndef ENSRNOTFOUND
#define ENSRNOTFOUND 163 /* Domain name not found */
#endif

View File

@ -181,7 +181,7 @@ extern int errno;
/* Define LWIP_ERRNO_STDINCLUDE if you want to include <errno.h> here */
#ifdef LWIP_ERRNO_STDINCLUDE
#include <errno.h>
#include <sys/errno.h>
#else /* LWIP_ERRNO_STDINCLUDE */
/* Define LWIP_ERRNO_INCLUDE to an equivalent of <errno.h> to include the error defines here */
#ifdef LWIP_ERRNO_INCLUDE

View File

@ -5,6 +5,7 @@
#define ERRNO 1
#define LWIP_ERRNO_STDINCLUDE
#define LWIP_SOCKET_SELECT 1
#define LWIP_SOCKET_POLL 1

View File

@ -13,7 +13,7 @@
#include <dfs_file.h>
#include <dfs_poll.h>
#include <dfs_net.h>
#include <sys/errno.h>
#include <sys/socket.h>
int accept(int s, struct sockaddr *addr, socklen_t *addrlen)

View File

@ -9,7 +9,7 @@
/* Multi-thread searching.
Illustrates: thread cancellation, cleanup handlers. */
#include <errno.h>
#include <sys/errno.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>

View File

@ -6,7 +6,7 @@
* Change Logs:
* Date Author Notes
*/
#include <errno.h>
#include <sys/errno.h>
#include <stdio.h>
#include <string.h>
#include <pthread.h>

View File

@ -11,7 +11,7 @@
* Test case that illustrates a timed wait on a condition variable.
*/
#include <errno.h>
#include <sys/errno.h>
#include <stdio.h>
#include <string.h>
#include <pthread.h>

View File

@ -11,7 +11,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <finsh.h>
#include <errno.h>
#include <sys/errno.h>
#include <sys/fcntl.h>
#include <sys/stat.h>

View File

@ -11,7 +11,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <finsh.h>
#include <errno.h>
#include <sys/errno.h>
static int errors = 0;
static void merror(const char *msg)

View File

@ -1,25 +0,0 @@
/*
* Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2020-09-05 Meco Man the first version
*/
#ifndef LIBC_LIMITS_H__
#define LIBC_LIMITS_H__
#include <limits.h>
#include <rtconfig.h>
#ifdef RT_USING_POSIX
#ifndef SSIZE_MAX
# define SSIZE_MAX LONG_MAX
#endif
#endif
#endif

View File

@ -13,14 +13,12 @@
/* definitions for libc if toolchain has no these definitions */
#include "libc/libc_stat.h"
#include "libc/libc_errno.h"
#include "libc/libc_fcntl.h"
#include "libc/libc_ioctl.h"
#include "libc/libc_dirent.h"
#include "libc/libc_signal.h"
#include "libc/libc_fdset.h"
#include "libc/libc_limits.h"
#include "libc/libc_stdio.h"
#ifndef RT_USING_LIBC