From: Joan Lledó <[email protected]>

To fix -Werror=enum-int-mismatch warnings
---
 lwip/iioctl-ops.c           | 30 +++++++--------
 lwip/io-ops.c               | 76 ++++++++++++++++++-------------------
 lwip/pfinet-ops.c           |  4 +-
 lwip/port/netif/hurdtunif.c | 28 +++++++-------
 lwip/socket-ops.c           | 48 +++++++++++------------
 lwip/startup-ops.c          |  2 +-
 6 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/lwip/iioctl-ops.c b/lwip/iioctl-ops.c
index f46b9cdb..f1f1a5ba 100644
--- a/lwip/iioctl-ops.c
+++ b/lwip/iioctl-ops.c
@@ -73,7 +73,7 @@ static kern_return_t
 siocgifXaddr (struct sock_user *user,
              ifname_t ifnam, sockaddr_t * addr, enum siocgif_type type)
 {
-  error_t err = 0;
+  kern_return_t err = 0;
   struct sockaddr_in *sin = (struct sockaddr_in *) addr;
   size_t buflen = sizeof (struct sockaddr);
   struct netif *netif;
@@ -120,7 +120,7 @@ static kern_return_t
 siocsifXaddr (struct sock_user *user,
              const ifname_t ifnam, sockaddr_t * addr, enum siocgif_type type)
 {
-  error_t err = 0;
+  kern_return_t err = 0;
   struct sockaddr_in sin;
   size_t buflen = sizeof (struct sockaddr_in);
   struct netif *netif;
@@ -192,7 +192,7 @@ lwip_S_iioctl_siocsifflags (struct sock_user * user,
                            const ifname_t ifnam,
                            short flags)
 {
-  error_t err = 0;
+  kern_return_t err = 0;
   struct netif *netif;
 
   if (!user)
@@ -214,7 +214,7 @@ lwip_S_iioctl_siocsifflags (struct sock_user * user,
 kern_return_t
 lwip_S_iioctl_siocgifflags (struct sock_user * user, ifname_t name, short 
*flags)
 {
-  error_t err = 0;
+  kern_return_t err = 0;
   struct netif *netif;
 
   if (!user)
@@ -243,7 +243,7 @@ lwip_S_iioctl_siocgifmetric (struct sock_user * user,
                             ifname_t ifnam,
                             int *metric)
 {
-  error_t err = 0;
+  kern_return_t err = 0;
   struct netif *netif;
 
   if (!user)
@@ -291,12 +291,12 @@ SIOCGIF (brdaddr, BRDADDR);
 SIOCGIF (netmask, NETMASK);
 
 /* 39 SIOCGIFHWADDR -- Get the hardware address of a network interface.  */
-error_t
+kern_return_t
 lwip_S_iioctl_siocgifhwaddr (struct sock_user * user,
                             ifname_t ifname,
                             sockaddr_t * addr)
 {
-  error_t err = 0;
+  kern_return_t err = 0;
   struct netif *netif;
 
   if (!user)
@@ -315,10 +315,10 @@ lwip_S_iioctl_siocgifhwaddr (struct sock_user * user,
 }
 
 /* 51 SIOCGIFMTU -- Get mtu of a network interface.  */
-error_t
+kern_return_t
 lwip_S_iioctl_siocgifmtu (struct sock_user * user, ifname_t ifnam, int *mtu)
 {
-  error_t err = 0;
+  kern_return_t err = 0;
   struct netif *netif;
 
   if (!user)
@@ -336,10 +336,10 @@ lwip_S_iioctl_siocgifmtu (struct sock_user * user, 
ifname_t ifnam, int *mtu)
 }
 
 /* 51 SIOCSIFMTU -- Set mtu of a network interface.  */
-error_t
+kern_return_t
 lwip_S_iioctl_siocsifmtu (struct sock_user * user, const ifname_t ifnam, int 
mtu)
 {
-  error_t err = 0;
+  kern_return_t err = 0;
   struct netif *netif;
 
   if (!user)
@@ -363,12 +363,12 @@ lwip_S_iioctl_siocsifmtu (struct sock_user * user, const 
ifname_t ifnam, int mtu
 }
 
 /* 100 SIOCGIFINDEX -- Get index number of a network interface.  */
-error_t
+kern_return_t
 lwip_S_iioctl_siocgifindex (struct sock_user * user,
                            ifname_t ifnam,
                            int *index)
 {
-  error_t err = 0;
+  kern_return_t err = 0;
   struct netif *netif;
   int i;
 
@@ -394,12 +394,12 @@ lwip_S_iioctl_siocgifindex (struct sock_user * user,
 }
 
 /* 101 SIOCGIFNAME -- Get name of a network interface from index number.  */
-error_t
+kern_return_t
 lwip_S_iioctl_siocgifname (struct sock_user * user,
                           ifname_t ifnam,
                           int *index)
 {
-  error_t err = 0;
+  kern_return_t err = 0;
   struct netif *netif;
   int i;
 
diff --git a/lwip/io-ops.c b/lwip/io-ops.c
index 0a5ae0af..0613af10 100644
--- a/lwip/io-ops.c
+++ b/lwip/io-ops.c
@@ -32,7 +32,7 @@
 
 #include <lwip/sockets.h>
 
-error_t
+kern_return_t
 lwip_S_io_write (struct sock_user *user,
                 const_data_t data,
                 mach_msg_type_number_t datalen,
@@ -56,12 +56,12 @@ lwip_S_io_write (struct sock_user *user,
   return errno;
 }
 
-error_t
+kern_return_t
 lwip_S_io_read (struct sock_user * user,
                data_t *data,
                mach_msg_type_number_t * datalen, off_t offset, vm_size_t 
amount)
 {
-  error_t err;
+  kern_return_t err;
   int alloced = 0;
   int flags;
 
@@ -104,17 +104,17 @@ lwip_S_io_read (struct sock_user * user,
   return errno;
 }
 
-error_t
+kern_return_t
 lwip_S_io_seek (struct sock_user * user,
                off_t offset, int whence, off_t * newp)
 {
   return user ? ESPIPE : EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_readable (struct sock_user * user, vm_size_t * amount)
 {
-  error_t err;
+  kern_return_t err;
   if (!user)
     return EOPNOTSUPP;
 
@@ -126,7 +126,7 @@ lwip_S_io_readable (struct sock_user * user, vm_size_t * 
amount)
   return errno;
 }
 
-error_t
+kern_return_t
 lwip_S_io_set_all_openmodes (struct sock_user * user, int bits)
 {
   int opt;
@@ -144,7 +144,7 @@ lwip_S_io_set_all_openmodes (struct sock_user * user, int 
bits)
   return errno;
 }
 
-error_t
+kern_return_t
 lwip_S_io_get_openmodes (struct sock_user * user, int *bits)
 {
   if (!user)
@@ -155,7 +155,7 @@ lwip_S_io_get_openmodes (struct sock_user * user, int *bits)
   return errno;
 }
 
-error_t
+kern_return_t
 lwip_S_io_set_some_openmodes (struct sock_user * user, int bits)
 {
   if (!user)
@@ -171,7 +171,7 @@ lwip_S_io_set_some_openmodes (struct sock_user * user, int 
bits)
 }
 
 
-error_t
+kern_return_t
 lwip_S_io_clear_some_openmodes (struct sock_user * user, int bits)
 {
   if (!user)
@@ -189,7 +189,7 @@ lwip_S_io_clear_some_openmodes (struct sock_user * user, 
int bits)
 /*
  * Arrange things to call lwip_poll()
  */
-static error_t
+static kern_return_t
 lwip_io_select_common (struct sock_user *user,
                       mach_port_t reply,
                       mach_msg_type_name_t reply_type,
@@ -200,7 +200,7 @@ lwip_io_select_common (struct sock_user *user,
   struct pollfd fdp;
   nfds_t nfds;
   mach_port_type_t type;
-  error_t err;
+  kern_return_t err;
 
   if (!user)
     return EOPNOTSUPP;
@@ -254,7 +254,7 @@ lwip_io_select_common (struct sock_user *user,
   return errno;
 }
 
-error_t
+kern_return_t
 lwip_S_io_select (struct sock_user * user,
                  mach_port_t reply,
                  mach_msg_type_name_t reply_type, int *select_type)
@@ -262,7 +262,7 @@ lwip_S_io_select (struct sock_user * user,
   return lwip_io_select_common (user, reply, reply_type, 0, select_type);
 }
 
-error_t
+kern_return_t
 lwip_S_io_select_timeout (struct sock_user * user,
                          mach_port_t reply,
                          mach_msg_type_name_t reply_type,
@@ -278,7 +278,7 @@ lwip_S_io_select_timeout (struct sock_user * user,
 }
 
 
-error_t
+kern_return_t
 lwip_S_io_stat (struct sock_user * user, struct stat * st)
 {
   if (!user)
@@ -296,14 +296,14 @@ lwip_S_io_stat (struct sock_user * user, struct stat * st)
   return 0;
 }
 
-error_t
+kern_return_t
 lwip_S_io_reauthenticate (struct sock_user * user, mach_port_t rend)
 {
   struct sock_user *newuser;
   uid_t gubuf[20], ggbuf[20], aubuf[20], agbuf[20];
   uid_t *gen_uids, *gen_gids, *aux_uids, *aux_gids;
   mach_msg_type_number_t genuidlen, gengidlen, auxuidlen, auxgidlen;
-  error_t err;
+  kern_return_t err;
   size_t i, j;
   auth_t auth;
   mach_port_t newright;
@@ -374,7 +374,7 @@ lwip_S_io_reauthenticate (struct sock_user * user, 
mach_port_t rend)
   return 0;
 }
 
-error_t
+kern_return_t
 lwip_S_io_restrict_auth (struct sock_user * user,
                         mach_port_t * newobject,
                         mach_msg_type_name_t * newobject_type,
@@ -409,7 +409,7 @@ lwip_S_io_restrict_auth (struct sock_user * user,
   return 0;
 }
 
-error_t
+kern_return_t
 lwip_S_io_duplicate (struct sock_user * user,
                     mach_port_t * newobject,
                     mach_msg_type_name_t * newobject_type)
@@ -426,14 +426,14 @@ lwip_S_io_duplicate (struct sock_user * user,
   return 0;
 }
 
-error_t
+kern_return_t
 lwip_S_io_identity (struct sock_user * user,
                    mach_port_t * id,
                    mach_msg_type_name_t * idtype,
                    mach_port_t * fsys,
                    mach_msg_type_name_t * fsystype, ino_t * fileno)
 {
-  error_t err;
+  kern_return_t err;
 
   if (!user)
     return EOPNOTSUPP;
@@ -457,13 +457,13 @@ lwip_S_io_identity (struct sock_user * user,
   return 0;
 }
 
-error_t
+kern_return_t
 lwip_S_io_revoke (struct sock_user * user)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_async (struct sock_user * user,
                 mach_port_t notify,
                 mach_port_t * id, mach_msg_type_name_t * idtype)
@@ -471,39 +471,39 @@ lwip_S_io_async (struct sock_user * user,
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_mod_owner (struct sock_user * user, pid_t owner)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_get_owner (struct sock_user * user, pid_t * owner)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_get_icky_async_id (struct sock_user * user,
                             mach_port_t * id, mach_msg_type_name_t * idtype)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_server_version (struct sock_user * user,
                          string_t name, int *major, int *minor, int *edit)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_pathconf (struct sock_user * user, int name, int *value)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_map (struct sock_user * user,
               mach_port_t * rdobj,
               mach_msg_type_name_t * rdobj_type,
@@ -512,58 +512,58 @@ lwip_S_io_map (struct sock_user * user,
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_map_cntl (struct sock_user * user,
                    mach_port_t * obj, mach_msg_type_name_t * obj_type)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_get_conch (struct sock_user * user)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_release_conch (struct sock_user * user)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_eofnotify (struct sock_user * user)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_prenotify (struct sock_user * user,
                     vm_offset_t start, vm_offset_t end)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_postnotify (struct sock_user * user,
                      vm_offset_t start, vm_offset_t end)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_readnotify (struct sock_user * user)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_readsleep (struct sock_user * user)
 {
   return EOPNOTSUPP;
 }
 
-error_t
+kern_return_t
 lwip_S_io_sigio (struct sock_user * user)
 {
   return EOPNOTSUPP;
diff --git a/lwip/pfinet-ops.c b/lwip/pfinet-ops.c
index d5afb94f..c30efccc 100644
--- a/lwip/pfinet-ops.c
+++ b/lwip/pfinet-ops.c
@@ -78,7 +78,7 @@ dev_ifconf (struct ifconf *ifc)
 /* Return the list of devices in the format provided by SIOCGIFCONF
    in IFR, but don't return more then AMOUNT bytes. If AMOUNT is
    negative, there is no limit.  */
-error_t
+kern_return_t
 lwip_S_pfinet_siocgifconf (io_t port,
                           vm_size_t amount,
                           char **ifr, mach_msg_type_number_t * len)
@@ -114,7 +114,7 @@ lwip_S_pfinet_siocgifconf (io_t port,
   return 0;
 }
 
-error_t
+kern_return_t
 lwip_S_pfinet_getroutes (io_t port,
                         vm_size_t amount,
                         data_t *routes,
diff --git a/lwip/port/netif/hurdtunif.c b/lwip/port/netif/hurdtunif.c
index 456dd297..067f482a 100644
--- a/lwip/port/netif/hurdtunif.c
+++ b/lwip/port/netif/hurdtunif.c
@@ -344,7 +344,7 @@ void (*trivfs_protid_destroy_hook) (struct trivfs_protid *) 
= pi_destroy_hook;
 /* Read data from an IO object.  If offset is -1, read from the object
    maintained file pointer.  If the object is not seekable, offset is
    ignored.  The amount desired to be read is in AMOUNT.  */
-error_t
+kern_return_t
 trivfs_S_io_read (struct trivfs_protid *cred,
                  mach_port_t reply, mach_msg_type_name_t reply_type,
                  data_t *data, mach_msg_type_number_t * data_len,
@@ -417,7 +417,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
    object at a time; servers implement congestion control by delaying
    responses to io_write.  Servers may drop data (returning ENOBUFS)
    if they receive more than one write when not prepared for it.  */
-error_t
+kern_return_t
 trivfs_S_io_write (struct trivfs_protid * cred,
                   mach_port_t reply,
                   mach_msg_type_name_t replytype,
@@ -513,13 +513,13 @@ trivfs_S_io_readable (struct trivfs_protid * cred,
    return the types that are then available.  ID_TAG is returned as passed; it
    is just for the convenience of the user in matching up reply messages with
    specific requests sent.  */
-static error_t
+static kern_return_t
 io_select_common (struct trivfs_protid *cred,
                  mach_port_t reply,
                  mach_msg_type_name_t reply_type,
                  struct timespec *tsp, int *type)
 {
-  error_t err;
+  kern_return_t err;
   struct hurdtunif *tunif;
 
   if (!cred)
@@ -579,7 +579,7 @@ io_select_common (struct trivfs_protid *cred,
     }
 }
 
-error_t
+kern_return_t
 trivfs_S_io_select (struct trivfs_protid * cred,
                    mach_port_t reply,
                    mach_msg_type_name_t reply_type, int *type)
@@ -587,7 +587,7 @@ trivfs_S_io_select (struct trivfs_protid * cred,
   return io_select_common (cred, reply, reply_type, NULL, type);
 }
 
-error_t
+kern_return_t
 trivfs_S_io_select_timeout (struct trivfs_protid * cred,
                            mach_port_t reply,
                            mach_msg_type_name_t reply_type,
@@ -597,7 +597,7 @@ trivfs_S_io_select_timeout (struct trivfs_protid * cred,
 }
 
 /* Change current read/write offset */
-error_t
+kern_return_t
 trivfs_S_io_seek (struct trivfs_protid * cred,
                  mach_port_t reply, mach_msg_type_name_t reply_type,
                  off_t offs, int whence, off_t * new_offs)
@@ -614,7 +614,7 @@ trivfs_S_io_seek (struct trivfs_protid * cred,
 /* Change the size of the file.  If the size increases, new blocks are
    zero-filled.  After successful return, it is safe to reference mapped
    areas of the file up to NEW_SIZE.  */
-error_t
+kern_return_t
 trivfs_S_file_set_size (struct trivfs_protid * cred,
                        mach_port_t reply, mach_msg_type_name_t reply_type,
                        off_t size)
@@ -633,7 +633,7 @@ trivfs_S_file_set_size (struct trivfs_protid * cred,
    will tell you which of O_READ, O_WRITE, and O_EXEC the object can
    be used for.  The O_ASYNC bit affects icky async I/O; good async
    I/O is done through io_async which is orthogonal to these calls. */
-error_t
+kern_return_t
 trivfs_S_io_set_all_openmodes (struct trivfs_protid * cred,
                               mach_port_t reply,
                               mach_msg_type_name_t reply_type, int mode)
@@ -647,7 +647,7 @@ trivfs_S_io_set_all_openmodes (struct trivfs_protid * cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_set_some_openmodes (struct trivfs_protid * cred,
                                mach_port_t reply,
                                mach_msg_type_name_t reply_type, int bits)
@@ -661,7 +661,7 @@ trivfs_S_io_set_some_openmodes (struct trivfs_protid * cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_clear_some_openmodes (struct trivfs_protid * cred,
                                  mach_port_t reply,
                                  mach_msg_type_name_t reply_type, int bits)
@@ -675,7 +675,7 @@ trivfs_S_io_clear_some_openmodes (struct trivfs_protid * 
cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_get_owner (struct trivfs_protid * cred,
                       mach_port_t reply,
                       mach_msg_type_name_t reply_type, pid_t * owner)
@@ -690,7 +690,7 @@ trivfs_S_io_get_owner (struct trivfs_protid * cred,
   return 0;
 }
 
-error_t
+kern_return_t
 trivfs_S_io_mod_owner (struct trivfs_protid * cred,
                       mach_port_t reply, mach_msg_type_name_t reply_type,
                       pid_t owner)
@@ -712,7 +712,7 @@ trivfs_S_io_mod_owner (struct trivfs_protid * cred,
    implement io_map but not io_map_cntl.  Some objects do not provide
    mapping; they will set none of the ports and return an error.  Such
    objects can still be accessed by io_read and io_write.  */
-error_t
+kern_return_t
 trivfs_S_io_map (struct trivfs_protid * cred,
                 mach_port_t reply,
                 mach_msg_type_name_t replyPoly,
diff --git a/lwip/socket-ops.c b/lwip/socket-ops.c
index 3c1f57b5..e053f73a 100644
--- a/lwip/socket-ops.c
+++ b/lwip/socket-ops.c
@@ -28,13 +28,13 @@
 #include <lwip/sockets.h>
 #include <lwip-hurd.h>
 
-error_t
+kern_return_t
 lwip_S_socket_create (struct trivfs_protid *master,
                      int sock_type,
                      int protocol,
                      mach_port_t * port, mach_msg_type_name_t * porttype)
 {
-  error_t err;
+  kern_return_t err;
   struct sock_user *user;
   struct socket *sock;
   int isroot;
@@ -87,7 +87,7 @@ lwip_S_socket_create (struct trivfs_protid *master,
 
 
 /* Listen on a socket. */
-error_t
+kern_return_t
 lwip_S_socket_listen (struct sock_user * user, int queue_limit)
 {
   if (!user)
@@ -98,7 +98,7 @@ lwip_S_socket_listen (struct sock_user * user, int 
queue_limit)
   return errno;
 }
 
-error_t
+kern_return_t
 lwip_S_socket_accept (struct sock_user * user,
                      mach_port_t * new_port,
                      mach_msg_type_name_t * new_port_type,
@@ -108,7 +108,7 @@ lwip_S_socket_accept (struct sock_user * user,
   struct sock_user *newuser;
   struct sockaddr_storage addr;
   socklen_t addr_len;
-  error_t err;
+  kern_return_t err;
   struct socket *sock, *newsock;
 
   if (!user)
@@ -146,10 +146,10 @@ lwip_S_socket_accept (struct sock_user * user,
   return errno;
 }
 
-error_t
+kern_return_t
 lwip_S_socket_connect (struct sock_user * user, struct sock_addr * addr)
 {
-  error_t err;
+  kern_return_t err;
 
   if (!user || !addr)
     return EOPNOTSUPP;
@@ -169,10 +169,10 @@ lwip_S_socket_connect (struct sock_user * user, struct 
sock_addr * addr)
   return errno;
 }
 
-error_t
+kern_return_t
 lwip_S_socket_bind (struct sock_user * user, struct sock_addr * addr)
 {
-  error_t err;
+  kern_return_t err;
 
   if (!user)
     return EOPNOTSUPP;
@@ -189,12 +189,12 @@ lwip_S_socket_bind (struct sock_user * user, struct 
sock_addr * addr)
   return errno;
 }
 
-error_t
+kern_return_t
 lwip_S_socket_name (struct sock_user * user,
                    mach_port_t * addr_port,
                    mach_msg_type_name_t * addr_port_name)
 {
-  error_t err;
+  kern_return_t err;
 
   if (!user)
     return EOPNOTSUPP;
@@ -204,12 +204,12 @@ lwip_S_socket_name (struct sock_user * user,
   return err;
 }
 
-error_t
+kern_return_t
 lwip_S_socket_peername (struct sock_user * user,
                        mach_port_t * addr_port,
                        mach_msg_type_name_t * addr_port_name)
 {
-  error_t err;
+  kern_return_t err;
 
   if (!user)
     return EOPNOTSUPP;
@@ -219,7 +219,7 @@ lwip_S_socket_peername (struct sock_user * user,
   return err;
 }
 
-error_t
+kern_return_t
 lwip_S_socket_connect2 (struct sock_user * user, struct sock_user * sock2)
 {
   /* We don't answer AF_UNIX requests */
@@ -229,7 +229,7 @@ lwip_S_socket_connect2 (struct sock_user * user, struct 
sock_user * sock2)
 /*
  * Receive address data, create a libports object and return its port
  */
-error_t
+kern_return_t
 lwip_S_socket_create_address (mach_port_t server,
                              int sockaddr_type,
                              const char *data,
@@ -237,7 +237,7 @@ lwip_S_socket_create_address (mach_port_t server,
                              mach_port_t * addr_port,
                              mach_msg_type_name_t * addr_port_type)
 {
-  error_t err;
+  kern_return_t err;
   struct sock_addr *addrstruct;
   const struct sockaddr *const sa = (void *) data;
 
@@ -265,7 +265,7 @@ lwip_S_socket_create_address (mach_port_t server,
   return 0;
 }
 
-error_t
+kern_return_t
 lwip_S_socket_fabricate_address (mach_port_t server,
                                 int sockaddr_type,
                                 mach_port_t * addr_port,
@@ -277,7 +277,7 @@ lwip_S_socket_fabricate_address (mach_port_t server,
 /*
  * Receive a libports object and return its data
  */
-error_t
+kern_return_t
 lwip_S_socket_whatis_address (struct sock_addr * addr,
                              int *type,
                              char **data, mach_msg_type_number_t * datalen)
@@ -295,7 +295,7 @@ lwip_S_socket_whatis_address (struct sock_addr * addr,
   return 0;
 }
 
-error_t
+kern_return_t
 lwip_S_socket_shutdown (struct sock_user * user, int direction)
 {
   if (!user)
@@ -306,7 +306,7 @@ lwip_S_socket_shutdown (struct sock_user * user, int 
direction)
   return errno;
 }
 
-error_t
+kern_return_t
 lwip_S_socket_getopt (struct sock_user * user,
                      int level, int option, char **data, 
mach_msg_type_number_t * datalen)
 {
@@ -321,7 +321,7 @@ lwip_S_socket_getopt (struct sock_user * user,
   return errno;
 }
 
-error_t
+kern_return_t
 lwip_S_socket_setopt (struct sock_user * user,
                      int level, int option, const char *data, 
mach_msg_type_number_t datalen)
 {
@@ -333,7 +333,7 @@ lwip_S_socket_setopt (struct sock_user * user,
   return errno;
 }
 
-error_t
+kern_return_t
 lwip_S_socket_send (struct sock_user * user,
                    struct sock_addr * addr,
                    int flags,
@@ -380,7 +380,7 @@ lwip_S_socket_send (struct sock_user * user,
   return errno;
 }
 
-error_t
+kern_return_t
 lwip_S_socket_recv (struct sock_user * user,
                    mach_port_t * addrport,
                    mach_msg_type_name_t * addrporttype,
@@ -394,7 +394,7 @@ lwip_S_socket_recv (struct sock_user * user,
                    mach_msg_type_number_t * controllen,
                    int *outflags, vm_size_t amount)
 {
-  error_t err;
+  kern_return_t err;
   union { struct sockaddr_storage storage; struct sockaddr sa; } addr;
   int alloced = 0;
   int sockflags;
diff --git a/lwip/startup-ops.c b/lwip/startup-ops.c
index ac1fe547..044e6a93 100644
--- a/lwip/startup-ops.c
+++ b/lwip/startup-ops.c
@@ -24,7 +24,7 @@
 
 /* The system is going down; destroy all the extant port rights.  That
    will cause net channels and such to close promptly.  */
-error_t
+kern_return_t
 lwip_S_startup_dosync (mach_port_t handle)
 {
   struct port_info *inpi = ports_lookup_port (lwip_bucket, handle,
-- 
2.50.1


Reply via email to