From 830491815ec916626d2446fc1cdd5cf26d66b2ad Mon Sep 17 00:00:00 2001 From: bjh21 Date: Wed, 16 Jul 2003 23:03:31 +0000 Subject: [PATCH] Following kleink's lead over in (he's braver than me), remove all feature-test macros. All of our E* macros are permitted to be defined by both POSIX and ANSI C, and life is a lot less confusing this way. --- sys/sys/errno.h | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/sys/sys/errno.h b/sys/sys/errno.h index 0757727a7ec5..928629c2df75 100644 --- a/sys/sys/errno.h +++ b/sys/sys/errno.h @@ -1,4 +1,4 @@ -/* $NetBSD: errno.h,v 1.32 2003/05/27 22:37:33 kleink Exp $ */ +/* $NetBSD: errno.h,v 1.33 2003/07/16 23:03:31 bjh21 Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -43,8 +43,6 @@ #ifndef _SYS_ERRNO_H_ #define _SYS_ERRNO_H_ -#include - #define EPERM 1 /* Operation not permitted */ #define ENOENT 2 /* No such file or directory */ #define ESRCH 3 /* No such process */ @@ -60,9 +58,7 @@ #define ENOMEM 12 /* Cannot allocate memory */ #define EACCES 13 /* Permission denied */ #define EFAULT 14 /* Bad address */ -#if defined(_NETBSD_SOURCE) #define ENOTBLK 15 /* Block device required */ -#endif /* _NETBSD_SOURCE */ #define EBUSY 16 /* Device busy */ #define EEXIST 17 /* File exists */ #define EXDEV 18 /* Cross-device link */ @@ -73,9 +69,7 @@ #define ENFILE 23 /* Too many open files in system */ #define EMFILE 24 /* Too many open files */ #define ENOTTY 25 /* Inappropriate ioctl for device */ -#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) #define ETXTBSY 26 /* Text file busy */ -#endif /* _XOPEN_SOURCE || _NETBSD_SOURCE */ #define EFBIG 27 /* File too large */ #define ENOSPC 28 /* No space left on device */ #define ESPIPE 29 /* Illegal seek */ @@ -89,7 +83,6 @@ /* non-blocking and interrupt i/o */ #define EAGAIN 35 /* Resource temporarily unavailable */ -#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) #define EWOULDBLOCK EAGAIN /* Operation would block */ #define EINPROGRESS 36 /* Operation now in progress */ #define EALREADY 37 /* Operation already in progress */ @@ -101,13 +94,9 @@ #define EPROTOTYPE 41 /* Protocol wrong type for socket */ #define ENOPROTOOPT 42 /* Protocol not available */ #define EPROTONOSUPPORT 43 /* Protocol not supported */ -#if defined(_NETBSD_SOURCE) #define ESOCKTNOSUPPORT 44 /* Socket type not supported */ -#endif /* _NETBSD_SOURCE */ #define EOPNOTSUPP 45 /* Operation not supported */ -#if defined(_NETBSD_SOURCE) #define EPFNOSUPPORT 46 /* Protocol family not supported */ -#endif /* _NETBSD_SOURCE */ #define EAFNOSUPPORT 47 /* Address family not supported by protocol family */ #define EADDRINUSE 48 /* Address already in use */ #define EADDRNOTAVAIL 49 /* Can't assign requested address */ @@ -115,69 +104,50 @@ /* ipc/network software -- operational errors */ #define ENETDOWN 50 /* Network is down */ #define ENETUNREACH 51 /* Network is unreachable */ -#if defined(_NETBSD_SOURCE) #define ENETRESET 52 /* Network dropped connection on reset */ -#endif /* _NETBSD_SOURCE */ #define ECONNABORTED 53 /* Software caused connection abort */ #define ECONNRESET 54 /* Connection reset by peer */ #define ENOBUFS 55 /* No buffer space available */ #define EISCONN 56 /* Socket is already connected */ #define ENOTCONN 57 /* Socket is not connected */ -#if defined(_NETBSD_SOURCE) #define ESHUTDOWN 58 /* Can't send after socket shutdown */ #define ETOOMANYREFS 59 /* Too many references: can't splice */ -#endif /* _NETBSD__SOURCE */ #define ETIMEDOUT 60 /* Operation timed out */ #define ECONNREFUSED 61 /* Connection refused */ #define ELOOP 62 /* Too many levels of symbolic links */ -#endif /* _XOPEN_SOURCE || _NETBSD_SOURCE */ #define ENAMETOOLONG 63 /* File name too long */ /* should be rearranged */ -#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) -#if defined(_NETBSD_SOURCE) #define EHOSTDOWN 64 /* Host is down */ -#endif /* _NETBSD_SOURCE */ #define EHOSTUNREACH 65 /* No route to host */ -#endif /* _XOPEN_SOURCE || _NETBSD_SOURCE */ #define ENOTEMPTY 66 /* Directory not empty */ /* quotas & mush */ -#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) -#if defined(_NETBSD_SOURCE) #define EPROCLIM 67 /* Too many processes */ #define EUSERS 68 /* Too many users */ -#endif /* _NETBSD_SOURCE */ #define EDQUOT 69 /* Disc quota exceeded */ /* Network File System */ #define ESTALE 70 /* Stale NFS file handle */ -#if defined(_NETBSD_SOURCE) #define EREMOTE 71 /* Too many levels of remote in path */ #define EBADRPC 72 /* RPC struct is bad */ #define ERPCMISMATCH 73 /* RPC version wrong */ #define EPROGUNAVAIL 74 /* RPC prog. not avail */ #define EPROGMISMATCH 75 /* Program version wrong */ #define EPROCUNAVAIL 76 /* Bad procedure for program */ -#endif /* _NETBSD_SOURCE */ -#endif /* _XOPEN_SOURCE || _NETBSD_SOURCE */ #define ENOLCK 77 /* No locks available */ #define ENOSYS 78 /* Function not implemented */ -#if defined(_NETBSD_SOURCE) #define EFTYPE 79 /* Inappropriate file type or format */ #define EAUTH 80 /* Authentication error */ #define ENEEDAUTH 81 /* Need authenticator */ -#endif /* _NETBSD_SOURCE */ /* SystemV IPC */ -#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) #define EIDRM 82 /* Identifier removed */ #define ENOMSG 83 /* No message of desired type */ #define EOVERFLOW 84 /* Value too large to be stored in data type */ -#endif /* _XOPEN_SOURCE || _NETBSD_SOURCE */ /* Wide/multibyte-character handling, ISO/IEC 9899/AMD1:1995 */ #define EILSEQ 85 /* Illegal byte sequence */