pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

corefx-git: Remove the uncommon errno symbols based on the conversation that transpired at dotnet /corefx#5983.



Module Name:	pkgsrc-wip
Committed By:	jasonwilliams200ok <necmon%yahoo.com@localhost>
Pushed By:	danglingpointer
Date:		Tue Feb 9 02:59:48 2016 +0000
Changeset:	671831074421760679c9496060863d779af46923

Modified Files:
	corefx-git/distinfo
	corefx-git/patches/patch-src_Native_System.Native_pal__errno.cpp
	corefx-git/patches/patch-src_Native_System.Native_pal__errno.h

Log Message:
corefx-git: Remove the uncommon errno symbols
based on the conversation that transpired at dotnet/corefx#5983.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=671831074421760679c9496060863d779af46923

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 corefx-git/distinfo                                |  4 +--
 .../patch-src_Native_System.Native_pal__errno.cpp  | 40 +++++++---------------
 .../patch-src_Native_System.Native_pal__errno.h    | 18 ++--------
 3 files changed, 17 insertions(+), 45 deletions(-)

diffs:
diff --git a/corefx-git/distinfo b/corefx-git/distinfo
index 10cd539..da459b1 100644
--- a/corefx-git/distinfo
+++ b/corefx-git/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 SHA1 (patch-src_Native_CMakeLists.txt) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
 SHA1 (patch-src_Native_Common_pal__config.h.in) = 37fa257faf95a5da68f9dfa2e609afdaddd1ed9a
-SHA1 (patch-src_Native_System.Native_pal__errno.cpp) = b9495d24c0b26b9b906f22681dd9ac76df3a6220
-SHA1 (patch-src_Native_System.Native_pal__errno.h) = 888ad64c143f7b21549bcfc0adb0c9121aeb6ca6
+SHA1 (patch-src_Native_System.Native_pal__errno.cpp) = f619d61f531e31cf80113553c7fcc84c15fd2798
+SHA1 (patch-src_Native_System.Native_pal__errno.h) = 12663841b61986caf2272c28ea7ac93da2940d6d
 SHA1 (patch-src_Native_System.Native_pal__interfaceaddresses.cpp) = 4f82e6f028fe2b9826ba6afb62869e42a0b6ee3d
 SHA1 (patch-src_Native_System.Native_pal__mount.cpp) = 7858f5ff60fcb0d60452648aef1b1034698e2c85
 SHA1 (patch-src_Native_System.Native_pal__networking.cpp) = 4f8ef34ed37564978e9370c6f07114b72ef36bd3
diff --git a/corefx-git/patches/patch-src_Native_System.Native_pal__errno.cpp b/corefx-git/patches/patch-src_Native_System.Native_pal__errno.cpp
index 787f213..a9a7ccf 100644
--- a/corefx-git/patches/patch-src_Native_System.Native_pal__errno.cpp
+++ b/corefx-git/patches/patch-src_Native_System.Native_pal__errno.cpp
@@ -2,55 +2,39 @@ $NetBSD$
 
 --- src/Native/System.Native/pal_errno.cpp.orig	2016-02-07 13:49:29.000000000 +0000
 +++ src/Native/System.Native/pal_errno.cpp
-@@ -6,7 +6,6 @@
- #include "pal_errno.h"
- #include "pal_utilities.h"
- 
--#include <errno.h>
- #include <string.h>
- #include <assert.h>
- 
-@@ -126,8 +125,10 @@ extern "C" Error SystemNative_ConvertErr
+@@ -126,8 +126,6 @@ extern "C" Error SystemNative_ConvertErr
              return PAL_ENOTDIR;
          case ENOTEMPTY:
              return PAL_ENOTEMPTY;
-+#ifdef ENOTRECOVERABLE
-         case ENOTRECOVERABLE:
-             return PAL_ENOTRECOVERABLE;
-+#endif
+-        case ENOTRECOVERABLE:
+-            return PAL_ENOTRECOVERABLE;
          case ENOTSOCK:
              return PAL_ENOTSOCK;
          case ENOTSUP:
-@@ -138,8 +139,10 @@ extern "C" Error SystemNative_ConvertErr
+@@ -138,8 +136,6 @@ extern "C" Error SystemNative_ConvertErr
              return PAL_ENXIO;
          case EOVERFLOW:
              return PAL_EOVERFLOW;
-+#ifdef EOWNERDEAD
-         case EOWNERDEAD:
-             return PAL_EOWNERDEAD;
-+#endif
+-        case EOWNERDEAD:
+-            return PAL_EOWNERDEAD;
          case EPERM:
              return PAL_EPERM;
          case EPIPE:
-@@ -298,8 +301,10 @@ extern "C" int32_t SystemNative_ConvertE
+@@ -298,8 +294,6 @@ extern "C" int32_t SystemNative_ConvertE
              return ENOTDIR;
          case PAL_ENOTEMPTY:
              return ENOTEMPTY;
-+#ifdef ENOTRECOVERABLE
-         case PAL_ENOTRECOVERABLE:
-             return ENOTRECOVERABLE;
-+#endif
+-        case PAL_ENOTRECOVERABLE:
+-            return ENOTRECOVERABLE;
          case PAL_ENOTSOCK:
              return ENOTSOCK;
          case PAL_ENOTSUP:
-@@ -310,8 +315,10 @@ extern "C" int32_t SystemNative_ConvertE
+@@ -310,8 +304,6 @@ extern "C" int32_t SystemNative_ConvertE
              return ENXIO;
          case PAL_EOVERFLOW:
              return EOVERFLOW;
-+#ifdef EOWNERDEAD
-         case PAL_EOWNERDEAD:
-             return EOWNERDEAD;
-+#endif
+-        case PAL_EOWNERDEAD:
+-            return EOWNERDEAD;
          case PAL_EPERM:
              return EPERM;
          case PAL_EPIPE:
diff --git a/corefx-git/patches/patch-src_Native_System.Native_pal__errno.h b/corefx-git/patches/patch-src_Native_System.Native_pal__errno.h
index 00e38d9..b54acbe 100644
--- a/corefx-git/patches/patch-src_Native_System.Native_pal__errno.h
+++ b/corefx-git/patches/patch-src_Native_System.Native_pal__errno.h
@@ -2,29 +2,17 @@ $NetBSD$
 
 --- src/Native/System.Native/pal_errno.h.orig	2016-02-07 13:49:29.000000000 +0000
 +++ src/Native/System.Native/pal_errno.h
-@@ -5,6 +5,7 @@
- #pragma once
- 
- #include "pal_types.h"
-+#include <errno.h>
- 
- /**
-  * Error codes returned via ConvertErrno.
-@@ -84,13 +85,17 @@ enum Error : int32_t
+@@ -84,13 +84,11 @@ enum Error : int32_t
      PAL_ENOTCONN = 0x10038,        // The socket is not connected.
      PAL_ENOTDIR = 0x10039,         // Not a directory or a symbolic link to a directory.
      PAL_ENOTEMPTY = 0x1003A,       // Directory not empty.
-+#ifdef ENOTRECOVERABLE
-     PAL_ENOTRECOVERABLE = 0x1003B, // State not recoverable.
-+#endif
+-    PAL_ENOTRECOVERABLE = 0x1003B, // State not recoverable.
      PAL_ENOTSOCK = 0x1003C,        // Not a socket.
      PAL_ENOTSUP = 0x1003D,         // Not supported (same value as EOPNOTSUP).
      PAL_ENOTTY = 0x1003E,          // Inappropriate I/O control operation.
      PAL_ENXIO = 0x1003F,           // No such device or address.
      PAL_EOVERFLOW = 0x10040,       // Value too large to be stored in data type.
-+#ifdef EOWNERDEAD
-     PAL_EOWNERDEAD = 0x10041,      // Previous owner died.
-+#endif
+-    PAL_EOWNERDEAD = 0x10041,      // Previous owner died.
      PAL_EPERM = 0x10042,           // Operation not permitted.
      PAL_EPIPE = 0x10043,           // Broken pipe.
      PAL_EPROTO = 0x10044,          // Protocol error.


Home | Main Index | Thread Index | Old Index