mingw-wsl-patches

Fork

# HG changeset patch
# Parent 48125b754d8193e8ccfc3b135b842741d17e141f

diff --git a/wslapi/include/winerror.h b/wslapi/include/winerror.h
--- a/wslapi/include/winerror.h
+++ b/wslapi/include/winerror.h
@@ -4,11 +4,11 @@
  * Manifest definitions of Windows system error condition codes.
  *
  * $Id$
  *
  * Written by Anders Norlander <anorland@hem2.passagen.se>
- * Copyright (C) 1998, 2000-2006, 2008, 2009, 2012, 2016, 2017,
+ * Copyright (C) 1998, 2000-2006, 2008, 2009, 2012, 2016-2018,
  *   MinGW.org Project
  *
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -48,13 +48,11 @@
 #define ERROR_INVALID_FUNCTION						    1L
 #define ERROR_FILE_NOT_FOUND						    2L
 #define ERROR_PATH_NOT_FOUND						    3L
 #define ERROR_TOO_MANY_OPEN_FILES					    4L
 #define ERROR_ACCESS_DENIED						    5L
-#define ERROR_INVALID_HANDLE						    6L
 #define ERROR_ARENA_TRASHED						    7L
-#define ERROR_NOT_ENOUGH_MEMORY 					    8L
 #define ERROR_INVALID_BLOCK						    9L
 #define ERROR_BAD_ENVIRONMENT						   10L
 #define ERROR_BAD_FORMAT						   11L
 #define ERROR_INVALID_ACCESS						   12L
 #define ERROR_INVALID_DATA						   13L
@@ -109,11 +107,10 @@
 #define ERROR_CANNOT_MAKE						   82L
 #define ERROR_FAIL_I24							   83L
 #define ERROR_OUT_OF_STRUCTURES 					   84L
 #define ERROR_ALREADY_ASSIGNED						   85L
 #define ERROR_INVALID_PASSWORD						   86L
-#define ERROR_INVALID_PARAMETER 					   87L
 #define ERROR_NET_WRITE_FAULT						   88L
 #define ERROR_NO_PROC_SLOTS						   89L
 #define ERROR_TOO_MANY_SEMAPHORES					  100L
 #define ERROR_EXCL_SEM_ALREADY_OWNED					  101L
 #define ERROR_SEM_IS_SET						  102L
@@ -248,13 +245,10 @@
 #define ERROR_INVALID_ADDRESS						  487L
 #define ERROR_ARITHMETIC_OVERFLOW					  534L
 #define ERROR_PIPE_CONNECTED						  535L
 #define ERROR_PIPE_LISTENING						  536L
 #define ERROR_EA_ACCESS_DENIED						  994L
-#define ERROR_OPERATION_ABORTED 					  995L
-#define ERROR_IO_INCOMPLETE						  996L
-#define ERROR_IO_PENDING						  997L
 #define ERROR_NOACCESS							  998L
 #define ERROR_SWAPERROR 						  999L
 #define ERROR_STACK_OVERFLOW						 1001L
 #define ERROR_INVALID_MESSAGE						 1002L
 #define ERROR_CAN_NOT_COMPLETE						 1003L
@@ -1687,10 +1681,23 @@
  */
 # define __WINSOCK_V2_ERRORS__ (defined _WINERROR_H || defined _WINSOCK2_H)
 #endif
 
 #if __WINSOCK_V2_ERRORS__
+/* The following subset of general error codes is NOT specific to WinSock v2
+ * protocol, but <winsock2.h> gratuitously assumes that they are defined, and
+ * then defines protocol-specific aliases for them; thus, we must ensure that
+ * they are defined both for general inclusion of <winerror.h>, and for the
+ * selective case of inclusion by <winsock2.h>
+ */
+#define ERROR_INVALID_HANDLE						    6L
+#define ERROR_NOT_ENOUGH_MEMORY 					    8L
+#define ERROR_INVALID_PARAMETER 					   87L
+#define ERROR_OPERATION_ABORTED 					  995L
+#define ERROR_IO_INCOMPLETE						  996L
+#define ERROR_IO_PENDING						  997L
+
 /* The following group of error codes are specific to the WinSock v2 protocol;
  * their definitions are suppressed during selective inclusion by <winsock.h>,
  * when such inclusion has not been requested by <winsock2.h>
  */
 #define WSAENOMORE				__WSA_ERRNO(  102 )  /*	10102L */