Separate out error_t definition

so interfaces needing it can get it.

	* stdlib/errno.h (error_t): Move definition to...
	* bits/types/error_t.h: ... new header.
	* stdlib/Makefile (headers): Add bits/types/error_t.h.
	* sysdeps/mach/hurd/bits/errno.h (error_t): Move definition to...
	* sysdeps/mach/hurd/bits/types/error_t.h: ... new header.
	* sysdeps/mach/hurd/errnos.awk (error_t): Likewise.
	* hurd/hurd.h: Include <bits/types/error_t.h>
	* hurd/hurd/fd.h: Include <bits/types/error_t.h>
	* hurd/hurd/id.h: Include <errno.h> and <bits/types/error_t.h>
	* hurd/hurd/lookup.h: Include <errno.h> and <bits/types/error_t.h>
	* hurd/hurd/resource.h: Include <bits/types/error_t.h>
	* hurd/hurd/signal.h: Include <bits/types/error_t.h>
	* hurd/hurd/sigpreempt.h: Include <bits/types/error_t.h>

diff --git a/ChangeLog b/ChangeLog
index 2810a9c..a2d8575 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,19 @@
        Include <stddef.h> and <bits/types/sigset_t.h>
        (struct hurd_signal_preemptor, hurd_catch_signal): Use __sighandler_t
        instead of sighandler_t.
+       * stdlib/errno.h (error_t): Move definition to...
+       * bits/types/error_t.h: ... new header.
+       * stdlib/Makefile (headers): Add bits/types/error_t.h.
+       * sysdeps/mach/hurd/bits/errno.h (error_t): Move definition to...
+       * sysdeps/mach/hurd/bits/types/error_t.h: ... new header.
+       * sysdeps/mach/hurd/errnos.awk (error_t): Likewise.
+       * hurd/hurd.h: Include <bits/types/error_t.h>
+       * hurd/hurd/fd.h: Include <bits/types/error_t.h>
+       * hurd/hurd/id.h: Include <errno.h> and <bits/types/error_t.h>
+       * hurd/hurd/lookup.h: Include <errno.h> and <bits/types/error_t.h>
+       * hurd/hurd/resource.h: Include <bits/types/error_t.h>
+       * hurd/hurd/signal.h: Include <bits/types/error_t.h>
+       * hurd/hurd/sigpreempt.h: Include <bits/types/error_t.h>
 
 2018-03-03  Andreas Schwab  <schwab@linux-m68k.org>
 

diff --git a/bits/types/error_t.h b/bits/types/error_t.h
new file mode 100644 (file)
index 0000000..8ea7a81
--- /dev/null
+++ b/bits/types/error_t.h
@@ -0,0 +1,24 @@
+/* Define error_t.
+   Copyright (C) 1991-2018 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef __error_t_defined
+# define __error_t_defined 1
+
+typedef int error_t;
+
+#endif

diff --git a/hurd/hurd.h b/hurd/hurd.h
index 029a7eb..d3c8689 100644 (file)
--- a/hurd/hurd.h
+++ b/hurd/hurd.h
@@ -41,6 +41,7 @@
 #include <hurd/port.h>
 
 #include <errno.h>
+#include <bits/types/error_t.h>
 #include <bits/types/sigset_t.h>
 
 #ifndef _HURD_H_EXTERN_INLINE

diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h
index 5a067d4..af5fdcf 100644 (file)
--- a/hurd/hurd/fd.h
+++ b/hurd/hurd/fd.h
@@ -142,6 +142,7 @@ _hurd_fd_get (int fd)
      __result; })
 \f
 #include <errno.h>
+#include <bits/types/error_t.h>
 
 /* Check if ERR should generate a signal.
    Returns the signal to take, or zero if none.  */

diff --git a/hurd/hurd/id.h b/hurd/hurd/id.h
index 28563c9..38988bf 100644 (file)
--- a/hurd/hurd/id.h
+++ b/hurd/hurd/id.h
@@ -21,6 +21,8 @@
 #define        _HURD_ID_H      1
 #include <features.h>
 #include <hurd/hurd_types.h>
+#include <errno.h>
+#include <bits/types/error_t.h>
 
 #include <cthreads.h>          /* For `struct mutex'.  */
 

diff --git a/hurd/hurd/lookup.h b/hurd/hurd/lookup.h
index 9a1f580..d0fa87b 100644 (file)
--- a/hurd/hurd/lookup.h
+++ b/hurd/hurd/lookup.h
@@ -19,6 +19,8 @@
 #ifndef _HURD_LOOKUP_H
 #define _HURD_LOOKUP_H 1
 
+#include <errno.h>
+#include <bits/types/error_t.h>
 #include <hurd/hurd_types.h>
 
 /* These functions all take two callback functions as the first two arguments.

diff --git a/hurd/hurd/resource.h b/hurd/hurd/resource.h
index 23b795d..eb93110 100644 (file)
--- a/hurd/hurd/resource.h
+++ b/hurd/hurd/resource.h
@@ -22,6 +22,7 @@
 #include <sys/types.h>
 #include <sys/resource.h>
 #include <errno.h>
+#include <bits/types/error_t.h>
 #include <hurd/process.h>
 
 /* This array contains the current resource limits for the process.  */

diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h
index 9cb5f3c..d4edf31 100644 (file)
--- a/hurd/hurd/signal.h
+++ b/hurd/hurd/signal.h
@@ -31,6 +31,7 @@
 #include <hurd/hurd_types.h>
 #include <signal.h>
 #include <errno.h>
+#include <bits/types/error_t.h>
 #include <bits/types/stack_t.h>
 #include <bits/types/sigset_t.h>
 #include <hurd/msg.h>

diff --git a/hurd/hurd/sigpreempt.h b/hurd/hurd/sigpreempt.h
index d059408..a1df82e 100644 (file)
--- a/hurd/hurd/sigpreempt.h
+++ b/hurd/hurd/sigpreempt.h
@@ -22,6 +22,7 @@
 #define __need_size_t
 #include <stddef.h>
 #include <errno.h>
+#include <bits/types/error_t.h>
 #include <signal.h>            /* For sighandler_t, SIG_ERR.  */
 #include <bits/types/sigset_t.h>
 struct hurd_sigstate;          /* <hurd/signal.h> */

diff --git a/stdlib/Makefile b/stdlib/Makefile
index 7c363a6..af1643c 100644 (file)
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -25,7 +25,7 @@ include ../Makeconfig
 headers        := stdlib.h bits/stdlib.h bits/stdlib-ldbl.h bits/stdlib-float.h      \
           monetary.h bits/monetary-ldbl.h                                    \
           inttypes.h stdint.h bits/wordsize.h                                \
-          errno.h sys/errno.h bits/errno.h                                   \
+          errno.h sys/errno.h bits/errno.h bits/types/error_t.h              \
           ucontext.h sys/ucontext.h                                          \
           alloca.h fmtmsg.h                                                  \
           bits/stdlib-bsearch.h sys/random.h bits/stdint-intn.h              \

diff --git a/stdlib/errno.h b/stdlib/errno.h
index e12fed6..fc8b496 100644 (file)
--- a/stdlib/errno.h
+++ b/stdlib/errno.h
@@ -45,12 +45,7 @@ extern int *__errno_location (void) __THROW __attribute_const__;
 extern char *program_invocation_name;
 extern char *program_invocation_short_name;
 
-/* bits/errno.h may have defined this type.  If it didn't, provide a
-   fallback definition.  */
-#  ifndef __error_t_defined
-#   define __error_t_defined 1
-typedef int error_t;
-#  endif
+#include <bits/types/error_t.h>
 
 # endif /* __USE_GNU */
 

diff --git a/sysdeps/mach/hurd/bits/errno.h b/sysdeps/mach/hurd/bits/errno.h
index f0a11af..f16cd51 100644 (file)
--- a/sysdeps/mach/hurd/bits/errno.h
+++ b/sysdeps/mach/hurd/bits/errno.h
@@ -215,14 +215,6 @@ enum __error_t_codes
   __FORCE_ERROR_T_CODES_SIGNED = -1
 };
 
-/* 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
-   symbolic values.  */
-# if !defined __error_t_defined && defined __USE_GNU
-#  define __error_t_defined 1
-typedef enum __error_t_codes error_t;
-# endif
-
 #endif /* not __ASSEMBLER__ */
 
 /* The C standard requires that all of the E-constants be

diff --git a/sysdeps/mach/hurd/bits/types/error_t.h b/sysdeps/mach/hurd/bits/types/error_t.h
new file mode 100644 (file)
index 0000000..286e5fd
--- /dev/null
+++ b/sysdeps/mach/hurd/bits/types/error_t.h
@@ -0,0 +1,29 @@
+/* Define error_t.
+   Copyright (C) 1991-2018 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <bits/errno.h>
+
+/* 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
+   symbolic values.  */
+#ifndef __error_t_defined
+# define __error_t_defined 1
+
+typedef enum __error_t_codes error_t;
+
+#endif

diff --git a/sysdeps/mach/hurd/errnos.awk b/sysdeps/mach/hurd/errnos.awk
index bc69e06..dc19350 100644 (file)
--- a/sysdeps/mach/hurd/errnos.awk
+++ b/sysdeps/mach/hurd/errnos.awk
@@ -181,14 +181,6 @@ function print_errno_enum(maxseq)
   print "  __FORCE_ERROR_T_CODES_SIGNED = -1";
   print "};";
   print "";
-  print "/* User-visible type of error codes.  It is ok to use 'int' or";
-  print "   'kern_return_t' for these, but with 'error_t' the debugger prints";
-  print "   symbolic values.  */";
-  print "# if !defined __error_t_defined && defined __USE_GNU";
-  print "#  define __error_t_defined 1";
-  print "typedef enum __error_t_codes error_t;"
-  print "# endif";
-  print "";
   print "#endif /* not __ASSEMBLER__ */";
 }