about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--NEWS20
-rw-r--r--sysdeps/mach/hurd/bits/errno.h6
3 files changed, 18 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 594a7d6b13..28f84a0c1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-04  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	[BZ #3665]
+	* sysdeps/mach/hurd/bits/errno.h: Regenerated.
+
 2012-11-04  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* csu/libc-start.c (LIBC_START_MAIN): Conditionalize use of
diff --git a/NEWS b/NEWS
index 41f4574c08..c7ddc6af52 100644
--- a/NEWS
+++ b/NEWS
@@ -9,16 +9,16 @@ Version 2.17
 
 * The following bugs are resolved with this release:
 
-  1349, 3439, 3479, 5044, 5246, 5298, 5400, 6530, 6778, 6808, 9685, 9914,
-  10014, 10038, 10631, 11438, 11607, 11638, 12140, 13412, 13542, 13601,
-  13629, 13679, 13696, 13717, 13741, 13939, 13966, 14042, 14047, 14090,
-  14150, 14151, 14152, 14154, 14157, 14166, 14173, 14195, 14237, 14251,
-  14252, 14283, 14298, 14303, 14307, 14328, 14331, 14336, 14337, 14347,
-  14349, 14376, 14417, 14459, 14476, 14477, 14505, 14510, 14516, 14518,
-  14519, 14530, 14532, 14538, 14543, 14544, 14545, 14557, 14562, 14568,
-  14576, 14579, 14583, 14587, 14595, 14602, 14610, 14621, 14638, 14645,
-  14648, 14652, 14660, 14661, 14669, 14683, 14694, 14716, 14743, 14767,
-  14783, 14784, 14785, 14796, 14797.
+  1349, 3439, 3479, 3665, 5044, 5246, 5298, 5400, 6530, 6778, 6808, 9685,
+  9914, 10014, 10038, 10631, 11438, 11607, 11638, 12140, 13412, 13542,
+  13601, 13629, 13679, 13696, 13717, 13741, 13939, 13966, 14042, 14047,
+  14090, 14150, 14151, 14152, 14154, 14157, 14166, 14173, 14195, 14237,
+  14251, 14252, 14283, 14298, 14303, 14307, 14328, 14331, 14336, 14337,
+  14347, 14349, 14376, 14417, 14459, 14476, 14477, 14505, 14510, 14516,
+  14518, 14519, 14530, 14532, 14538, 14543, 14544, 14545, 14557, 14562,
+  14568, 14576, 14579, 14583, 14587, 14595, 14602, 14610, 14621, 14638,
+  14645, 14648, 14652, 14660, 14661, 14669, 14683, 14694, 14716, 14743,
+  14767, 14783, 14784, 14785, 14796, 14797.
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and
diff --git a/sysdeps/mach/hurd/bits/errno.h b/sysdeps/mach/hurd/bits/errno.h
index a7d57adeb6..3b6fe76b37 100644
--- a/sysdeps/mach/hurd/bits/errno.h
+++ b/sysdeps/mach/hurd/bits/errno.h
@@ -212,8 +212,8 @@ enum __error_t_codes
 #define	EPROTO          _HURD_ERRNO (116)/* Protocol error */
 	ETIME           = _HURD_ERRNO (117),
 #define	ETIME           _HURD_ERRNO (117)/* Timer expired */
-	ECANCELED       = _HURD_ERRNO (118),
-#define	ECANCELED       _HURD_ERRNO (118)/* Operation canceled */
+	ECANCELED       = _HURD_ERRNO (119),
+#define	ECANCELED       _HURD_ERRNO (119)/* Operation canceled */
 
 	/* Errors from <mach/message.h>.  */
 	EMACH_SEND_IN_PROGRESS          = 0x10000001,
@@ -297,7 +297,7 @@ enum __error_t_codes
 
 };
 
-#define	_HURD_ERRNOS	119
+#define	_HURD_ERRNOS	120
 
 /* User-visible type of error codes.  It is ok to use `int' or
    `kern_return_t' for these, but with `error_t' the debugger prints