Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 4f8a814

Browse files
nguerreranguerrera
committed
Merge pull request #2864 from janhenke/Native-FreeBSD-fix1
Fix System.Native shim on FreeBSD
2 parents 8e156b9 + 6d9ffc8 commit 4f8a814

File tree

3 files changed

+0
-16
lines changed

3 files changed

+0
-16
lines changed

‎src/Common/src/Interop/Unix/Interop.Errors.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ internal enum Error
6161
ENETUNREACH = 0x10028, // Network unreachable.
6262
ENFILE = 0x10029, // Too many files open in system.
6363
ENOBUFS = 0x1002A, // No buffer space available.
64-
ENODATA = 0x1002B, // No message is available on the STREAM head read queue.
6564
ENODEV = 0x1002C, // No such device.
6665
ENOENT = 0x1002D, // No such file or directory.
6766
ENOEXEC = 0x1002E, // Executable file format error.
@@ -71,8 +70,6 @@ internal enum Error
7170
ENOMSG = 0x10032, // No message of the desired type.
7271
ENOPROTOOPT = 0x10033, // Protocol not available.
7372
ENOSPC = 0x10034, // No space left on device.
74-
ENOSR = 0x10035, // No STREAM resources.
75-
ENOSTR = 0x10036, // Not a STREAM.
7673
ENOSYS = 0x10037, // Function not supported.
7774
ENOTCONN = 0x10038, // The socket is not connected.
7875
ENOTDIR = 0x10039, // Not a directory or a symbolic link to a directory.
@@ -94,7 +91,6 @@ internal enum Error
9491
ESPIPE = 0x10049, // Invalid seek.
9592
ESRCH = 0x1004A, // No such process.
9693
ESTALE = 0x1004B, // Reserved.
97-
ETIME = 0x1004C, // Stream ioctl() timeout.
9894
ETIMEDOUT = 0x1004D, // Connection timed out.
9995
ETXTBSY = 0x1004E, // Text file busy.
10096
EXDEV = 0x1004F, // Cross-device link.

‎src/Native/System.Native/pal_errno.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ Error ConvertErrorPlatformToPal(int32_t platformErrno)
5656
case ENETUNREACH: return Error::PAL_ENETUNREACH;
5757
case ENFILE: return Error::PAL_ENFILE;
5858
case ENOBUFS: return Error::PAL_ENOBUFS;
59-
case ENODATA: return Error::PAL_ENODATA;
6059
case ENODEV: return Error::PAL_ENODEV;
6160
case ENOENT: return Error::PAL_ENOENT;
6261
case ENOEXEC: return Error::PAL_ENOEXEC;
@@ -66,8 +65,6 @@ Error ConvertErrorPlatformToPal(int32_t platformErrno)
6665
case ENOMSG: return Error::PAL_ENOMSG;
6766
case ENOPROTOOPT: return Error::PAL_ENOPROTOOPT;
6867
case ENOSPC: return Error::PAL_ENOSPC;
69-
case ENOSR: return Error::PAL_ENOSR;
70-
case ENOSTR: return Error::PAL_ENOSTR;
7168
case ENOSYS: return Error::PAL_ENOSYS;
7269
case ENOTCONN: return Error::PAL_ENOTCONN;
7370
case ENOTDIR: return Error::PAL_ENOTDIR;
@@ -89,7 +86,6 @@ Error ConvertErrorPlatformToPal(int32_t platformErrno)
8986
case ESPIPE: return Error::PAL_ESPIPE;
9087
case ESRCH: return Error::PAL_ESRCH;
9188
case ESTALE: return Error::PAL_ESTALE;
92-
case ETIME: return Error::PAL_ETIME;
9389
case ETIMEDOUT: return Error::PAL_ETIMEDOUT;
9490
case ETXTBSY: return Error::PAL_ETXTBSY;
9591
case EXDEV: return Error::PAL_EXDEV;
@@ -155,7 +151,6 @@ int32_t ConvertErrorPalToPlatform(Error error)
155151
case Error::PAL_ENETUNREACH: return ENETUNREACH;
156152
case Error::PAL_ENFILE: return ENFILE;
157153
case Error::PAL_ENOBUFS: return ENOBUFS;
158-
case Error::PAL_ENODATA: return ENODATA;
159154
case Error::PAL_ENODEV: return ENODEV;
160155
case Error::PAL_ENOENT: return ENOENT;
161156
case Error::PAL_ENOEXEC: return ENOEXEC;
@@ -165,8 +160,6 @@ int32_t ConvertErrorPalToPlatform(Error error)
165160
case Error::PAL_ENOMSG: return ENOMSG;
166161
case Error::PAL_ENOPROTOOPT: return ENOPROTOOPT;
167162
case Error::PAL_ENOSPC: return ENOSPC;
168-
case Error::PAL_ENOSR: return ENOSR;
169-
case Error::PAL_ENOSTR: return ENOSTR;
170163
case Error::PAL_ENOSYS: return ENOSYS;
171164
case Error::PAL_ENOTCONN: return ENOTCONN;
172165
case Error::PAL_ENOTDIR: return ENOTDIR;
@@ -188,7 +181,6 @@ int32_t ConvertErrorPalToPlatform(Error error)
188181
case Error::PAL_ESPIPE: return ESPIPE;
189182
case Error::PAL_ESRCH: return ESRCH;
190183
case Error::PAL_ESTALE: return ESTALE;
191-
case Error::PAL_ETIME: return ETIME;
192184
case Error::PAL_ETIMEDOUT: return ETIMEDOUT;
193185
case Error::PAL_ETXTBSY: return ETXTBSY;
194186
case Error::PAL_EXDEV: return EXDEV;

‎src/Native/System.Native/pal_errno.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ enum class Error : int32_t
7070
PAL_ENETUNREACH = 0x10028, // Network unreachable.
7171
PAL_ENFILE = 0x10029, // Too many files open in system.
7272
PAL_ENOBUFS = 0x1002A, // No buffer space available.
73-
PAL_ENODATA = 0x1002B, // No message is available on the STREAM head read queue.
7473
PAL_ENODEV = 0x1002C, // No such device.
7574
PAL_ENOENT = 0x1002D, // No such file or directory.
7675
PAL_ENOEXEC = 0x1002E, // Executable file format error.
@@ -80,8 +79,6 @@ enum class Error : int32_t
8079
PAL_ENOMSG = 0x10032, // No message of the desired type.
8180
PAL_ENOPROTOOPT = 0x10033, // Protocol not available.
8281
PAL_ENOSPC = 0x10034, // No space left on device.
83-
PAL_ENOSR = 0x10035, // No STREAM resources.
84-
PAL_ENOSTR = 0x10036, // Not a STREAM.
8582
PAL_ENOSYS = 0x10037, // Function not supported.
8683
PAL_ENOTCONN = 0x10038, // The socket is not connected.
8784
PAL_ENOTDIR = 0x10039, // Not a directory or a symbolic link to a directory.
@@ -103,7 +100,6 @@ enum class Error : int32_t
103100
PAL_ESPIPE = 0x10049, // Invalid seek.
104101
PAL_ESRCH = 0x1004A, // No such process.
105102
PAL_ESTALE = 0x1004B, // Reserved.
106-
PAL_ETIME = 0x1004C, // Stream ioctl() timeout.
107103
PAL_ETIMEDOUT = 0x1004D, // Connection timed out.
108104
PAL_ETXTBSY = 0x1004E, // Text file busy.
109105
PAL_EXDEV = 0x1004F, // Cross-device link.

0 commit comments

Comments
 (0)