Changeset 96069 in vbox for trunk/include

Timestamp:

Aug 5, 2022 11:07:30 PM (2 years ago)

Author:

vboxsync

Message:

iprt/errno.h,nocrt/errno.h: Use the iprt/errno.h wrapper in nocrt context, added ENOSYS and some others to it. bugref:10261

Location:

trunk/include/iprt

Files:

• errno.h (modified) (7 diffs)
• nocrt/errno.h (modified) (2 diffs)

trunk/include/iprt/errno.h

@@ -122 +122 @@
 #  define EDEADLK               (36)
 # else
-#  define EDEADLK               (45)
+#  define EDEADLK               (45)    /* solaris */
 # endif
 #endif
@@ -206 +206 @@
 # elif defined(RT_OS_LINUX)
 #  define ENOMSG                (42)
+# elif defined(RT_OS_WINDOWS)
+#  define ENOMSG                (122)
 # else
 #  define ENOMSG                (35)
@@ -222 +224 @@
 #  define EIDRM                 (43)
 # elif defined(RT_OS_WINDOWS)
-#  define EIDRM                 (600)
+#  define EIDRM                 (111)
 # else
 #  define EIDRM                 (36)
@@ -232 +234 @@
 # elif defined(RT_OS_LINUX)
 #  define EINPROGRESS           (115)
-# else
-#  define EINPROGRESS           (150)
+# elif defined(RT_OS_WINDOWS)
+#  define EINPROGRESS           (112)
+# else
+#  define EINPROGRESS           (150)   /* solaris */
 # endif
 #endif
@@ -241 +245 @@
 # elif defined(RT_OS_LINUX)
 #  define ENAMETOOLONG          (36)
-# else
-#  define ENAMETOOLONG          (78)
+# elif defined(RT_OS_WINDOWS)
+#  define ENAMETOOLONG          (38)
+# else
+#  define ENAMETOOLONG          (78)    /* solaris */
 # endif
 #endif
@@ -259 +265 @@
 # elif defined(RT_OS_LINUX)
 #  define ENOLCK                (37)
+# elif defined(RT_OS_WINDOWS)
+#  define ENOLCK                (39)
 # else
 #  define ENOLCK                (46)
@@ -273 +281 @@
 #endif
 
-/** @todo errno constants {37..44}. */
+/* 38 - Also ENAMETOOLONG on Windows. */
+#ifndef ENOSYS
+# if defined(RT_ERRNO_OS_BSD)
+#  define ENOSYS                (78)
+# elif defined(RT_OS_LINUX)
+#  define ENOSYS                (38)
+# elif defined(RT_OS_WINDOWS)
+#  define ENOSYS                (40)
+# else
+#  define ENOSYS                (89)    /* solaris */
+# endif
+#endif
+#ifndef ENOTSOCK
+# if defined(RT_ERRNO_OS_BSD)
+#  define ENOTSOCK              (38)
+# elif defined(RT_OS_LINUX)
+#  define ENOTSOCK              (88)
+# elif defined(RT_OS_WINDOWS)
+#  define ENOTSOCK              (128)
+# else
+#  define ENOTSOCK              (95)    /* solaris */
+# endif
+#endif
+#ifndef EL2NSYNC
+# if defined(RT_OS_LINUX)
+#  define EL2NSYNC              (45)
+# elif defined(RT_ERRNO_OS_SYSV_HARDCORE)
+#  define EL2NSYNC              (38)    /* solaris */
+# endif
+#endif
+
+/* 39 - Also ENOLCK on Windows. */
+#ifndef ENOTEMPTY
+# if defined(RT_ERRNO_OS_BSD)
+#  define ENOTEMPTY             (66)
+# elif defined(RT_OS_LINUX)
+#  define ENOTEMPTY             (39)
+# elif defined(RT_OS_WINDOWS)
+#  define ENOTEMPTY             (41)
+# else
+#  define ENOTEMPTY             (93)    /* solaris */
+# endif
+#endif
+#ifndef EDESTADDRREQ
+# if defined(RT_ERRNO_OS_BSD)
+#  define EDESTADDRREQ          (39)
+# elif defined(RT_OS_LINUX)
+#  define EDESTADDRREQ          (89)
+# elif defined(RT_OS_WINDOWS)
+#  define EDESTADDRREQ          (109)
+# else
+#  define EDESTADDRREQ          (96)    /* solaris */
+# endif
+#endif
+#ifndef EL3HLT
+# if defined(RT_OS_LINUX)
+#  define EL3HLT                (46)
+# elif defined(RT_ERRNO_OS_SYSV_HARDCORE)
+#  define EL3HLT                (39)    /* solaris */
+# endif
+#endif
+
+/* 40 - Also ENOSYS on Windows. */
+#ifndef ELOOP
+# if defined(RT_ERRNO_OS_BSD)
+#  define ELOOP                 (62)
+# elif defined(RT_OS_LINUX)
+#  define ELOOP                 (40)
+# elif defined(RT_OS_WINDOWS)
+#  define ELOOP                 (114)
+# else
+#  define ELOOP                 (90)    /* solaris */
+# endif
+#endif
+#ifndef EMSGSIZE
+# if defined(RT_ERRNO_OS_BSD)
+#  define EMSGSIZE              (40)
+# elif defined(RT_OS_LINUX)
+#  define EMSGSIZE              (90)
+# elif defined(RT_OS_WINDOWS)
+#  define EMSGSIZE              (115)
+# else
+#  define EMSGSIZE              (97)    /* solaris */
+# endif
+#endif
+#ifndef EL3RST
+# if defined(RT_OS_LINUX)
+#  define EL3RST                (47)
+# elif defined(RT_ERRNO_OS_SYSV_HARDCORE)
+#  define EL3RST                (40)    /* solaris */
+# endif
+#endif
+
+/** @todo errno constants {41..44}. */
 
 /* 45 - also EDEADLK on Solaris, EL2NSYNC on Linux. */

trunk/include/iprt/nocrt/errno.h

@@ -31 +31 @@
 
 #include <iprt/types.h>
-
 #ifdef IPRT_NO_CRT_FOR_3RD_PARTY
-
-# define EINVAL 22
-# define ERANGE 34
-# define ENOMEM 12
-# define EACCES 13
-# define EAGAIN 35
-# define EFAULT 14
-# define EINTR 4
-# define ENOSYS 78
-# define ESRCH 3
-# define EEXIST 17
+# include <iprt/errno.h>
 
 RT_C_DECLS_BEGIN
@@ -54 +43 @@
 #endif /* IPRT_NO_CRT_FOR_3RD_PARTY */
 
-
 #endif /* !IPRT_INCLUDED_nocrt_errno_h */