Fix readdir regressions on sparc 32-bit.

[platform/upstream/glibc.git] / hurd / hurd.h

diff --git a/hurd/hurd.h b/hurd/hurd.h
index e9c2db8..f302e04 100644 (file)
--- a/hurd/hurd.h
+++ b/hurd/hurd.h
@@ -1,20 +1,19 @@
-/* Copyright (C) 1993,94,95,96,97,98,99 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2013 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 Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   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        _HURD_H
 
@@ -43,7 +42,11 @@
 
 #include <errno.h>
 
-_EXTERN_INLINE int
+#ifndef _HURD_H_EXTERN_INLINE
+#define _HURD_H_EXTERN_INLINE __extern_inline
+#endif
+
+_HURD_H_EXTERN_INLINE int
 __hurd_fail (error_t err)
 {
   switch (err)
@@ -57,13 +60,16 @@ __hurd_fail (error_t err)
     case KERN_NO_SPACE:
       err = ENOMEM;
       break;
+
     case KERN_INVALID_ARGUMENT:
       err = EINVAL;
       break;
 
     case 0:
       return 0;
+
     default:
+      break;
     }
 
   errno = err;
@@ -75,7 +81,7 @@ __hurd_fail (error_t err)
 extern int _hurd_exec_flags;   /* Flags word passed in exec_startup.  */
 extern struct hurd_port *_hurd_ports;
 extern unsigned int _hurd_nports;
-extern volatile mode_t _hurd_umask;
+extern mode_t _hurd_umask;
 extern sigset_t _hurdsig_traced;
 
 /* Shorthand macro for internal library code referencing _hurd_ports (see
@@ -292,7 +298,9 @@ extern error_t hurd_sig_post (pid_t pid, int sig, mach_port_t refport);
    other than the proc server (such as a bootstrap filesystem) can set
    these variables to install the ports.  */
 
-extern kern_return_t get_privileged_ports (host_priv_t *host_priv_ptr,
+extern kern_return_t __get_privileged_ports (mach_port_t *host_priv_ptr,
+                                            device_t *device_master_ptr);
+extern kern_return_t get_privileged_ports (mach_port_t *host_priv_ptr,
                                           device_t *device_master_ptr);
 extern mach_port_t _hurd_host_priv, _hurd_device_master;