From 93b2a8e75197568ac47fc92c2f104c255cbf2415 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 10 Jan 2000 11:44:24 +0000 Subject: [PATCH] 2000-01-10 Andreas Jaeger * sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h: Add missing int's. * sysdeps/unix/sysv/linux/mips/sys/acct.h: Remove K&R support, add missing int's. * sysdeps/unix/sysv/linux/mips/bits/errno.h: Remove K&R support. * sysdeps/unix/sysv/linux/mips/bits/ipc.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/siginfo.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/cachectl.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/sysmips.h: Likewise. --- sysdeps/unix/sysv/linux/mips/bits/errno.h | 4 ++-- sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h | 18 +++++++++--------- sysdeps/unix/sysv/linux/mips/bits/ipc.h | 6 +++--- sysdeps/unix/sysv/linux/mips/bits/sigaction.h | 6 +++--- sysdeps/unix/sysv/linux/mips/bits/siginfo.h | 6 +++--- sysdeps/unix/sysv/linux/mips/bits/socket.h | 10 +++++----- sysdeps/unix/sysv/linux/mips/sys/acct.h | 8 ++++---- sysdeps/unix/sysv/linux/mips/sys/cachectl.h | 10 +++++----- sysdeps/unix/sysv/linux/mips/sys/sysmips.h | 6 +++--- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/sysdeps/unix/sysv/linux/mips/bits/errno.h b/sysdeps/unix/sysv/linux/mips/bits/errno.h index 7782c0b..c45829a 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/errno.h +++ b/sysdeps/unix/sysv/linux/mips/bits/errno.h @@ -1,5 +1,5 @@ /* Error constants. MIPS/Linux specific version. - Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2000 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 @@ -32,7 +32,7 @@ extern int errno; /* Function to get address of global `errno' variable. */ -extern int *__errno_location __P ((void)) __attribute__ ((__const__)); +extern int *__errno_location (void) __THROW __attribute__ ((__const__)); # if defined _LIBC /* We wouldn't need a special macro anymore but it is history. */ diff --git a/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h b/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h index 7959570..573f9e7 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h +++ b/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h @@ -1,5 +1,5 @@ /* Structure types for pre-termios terminal ioctls. Linux/MIPS version. - Copyright (C) 1997, 1999 Free Software Foundation, Inc. + Copyright (C) 1997, 1999, 2000 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 @@ -26,19 +26,19 @@ struct winsize { - unsigned short ws_row; - unsigned short ws_col; - unsigned short ws_xpixel; - unsigned short ws_ypixel; + unsigned short int ws_row; + unsigned short int ws_col; + unsigned short int ws_xpixel; + unsigned short int ws_ypixel; }; #define NCC 8 struct termio { - unsigned short c_iflag; /* input mode flags */ - unsigned short c_oflag; /* output mode flags */ - unsigned short c_cflag; /* control mode flags */ - unsigned short c_lflag; /* local mode flags */ + unsigned short int c_iflag; /* input mode flags */ + unsigned short int c_oflag; /* output mode flags */ + unsigned short int c_cflag; /* control mode flags */ + unsigned short int c_lflag; /* local mode flags */ char c_line; /* line discipline */ /* Yes, this is really NCCS. */ unsigned char c_cc[32 /* NCCS */]; /* control characters */ diff --git a/sysdeps/unix/sysv/linux/mips/bits/ipc.h b/sysdeps/unix/sysv/linux/mips/bits/ipc.h index 5c36d99..3c2e527 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/ipc.h +++ b/sysdeps/unix/sysv/linux/mips/bits/ipc.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1995, 96, 97, 98, 99, 2000 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 @@ -53,8 +53,8 @@ struct ipc_perm __BEGIN_DECLS /* The actual system call: all functions are multiplexed by this. */ -extern int __ipc __P ((int __call, int __first, int __second, int __third, - void *__ptr)); +extern int __ipc (int __call, int __first, int __second, int __third, + void *__ptr) __THROW; __END_DECLS diff --git a/sysdeps/unix/sysv/linux/mips/bits/sigaction.h b/sysdeps/unix/sysv/linux/mips/bits/sigaction.h index 963b425..04179d2 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/sigaction.h +++ b/sysdeps/unix/sysv/linux/mips/bits/sigaction.h @@ -1,5 +1,5 @@ /* The proper definitions for Linux/MIPS's sigaction. - Copyright (C) 1993, 94, 95, 97, 98, 99 Free Software Foundation, Inc. + Copyright (C) 1993,94,95,97,98,99,2000 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 @@ -34,7 +34,7 @@ struct sigaction /* Used if SA_SIGINFO is not set. */ __sighandler_t sa_handler; /* Used if SA_SIGINFO is set. */ - void (*sa_sigaction) __PMT ((int, siginfo_t *, void *)); + void (*sa_sigaction) (int, siginfo_t *, void *); } __sigaction_handler; # define sa_handler __sigaction_handler.sa_handler @@ -47,7 +47,7 @@ struct sigaction /* The ABI says here are two unused ints following. */ /* Restore handler. */ - void (*sa_restorer) __PMT ((void)); + void (*sa_restorer) (void); #if _MIPS_ISA == _MIPS_ISA_MIPS1 || _MIPS_ISA == _MIPS_ISA_MIPS2 int sa_resv[1]; diff --git a/sysdeps/unix/sysv/linux/mips/bits/siginfo.h b/sysdeps/unix/sysv/linux/mips/bits/siginfo.h index d141869..9d348ac 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/siginfo.h +++ b/sysdeps/unix/sysv/linux/mips/bits/siginfo.h @@ -1,5 +1,5 @@ /* siginfo_t, sigevent and constants. Linux version. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 2000 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 @@ -258,8 +258,8 @@ typedef struct sigevent struct { - void (*_function) __PMT ((sigval_t)); /* Function to start. */ - void *_attribute; /* Really pthread_attr_t. */ + void (*_function) (sigval_t); /* Function to start. */ + void *_attribute; /* Really pthread_attr_t. */ } _sigev_thread; } _sigev_un; } sigevent_t; diff --git a/sysdeps/unix/sysv/linux/mips/bits/socket.h b/sysdeps/unix/sysv/linux/mips/bits/socket.h index 74f54e8..747b119 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/socket.h +++ b/sysdeps/unix/sysv/linux/mips/bits/socket.h @@ -1,5 +1,5 @@ /* System-specific socket constants and types. Linux/MIPS version. - Copyright (C) 1991,92,94,95,96,97,98,99 Free Software Foundation, Inc. + Copyright (C) 1991,92,94,95,96,97,98,99,2000 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 @@ -203,13 +203,13 @@ enum `sendmsg' and received by `recvmsg'. */ struct msghdr { - __ptr_t msg_name; /* Address to send to/receive from. */ + void *msg_name; /* Address to send to/receive from. */ socklen_t msg_namelen; /* Length of address data. */ struct iovec *msg_iov; /* Vector of data to send/receive into. */ size_t msg_iovlen; /* Number of elements in the vector. */ - __ptr_t msg_control; /* Ancillary data (eg BSD filedesc passing). */ + void *msg_control; /* Ancillary data (eg BSD filedesc passing). */ size_t msg_controllen; /* Ancillary data buffer length. */ int msg_flags; /* Flags on received message. */ @@ -244,8 +244,8 @@ struct cmsghdr + CMSG_ALIGN (sizeof (struct cmsghdr))) #define CMSG_LEN(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len)) -extern struct cmsghdr *__cmsg_nxthdr __P ((struct msghdr *__mhdr, - struct cmsghdr *__cmsg)); +extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr, + struct cmsghdr *__cmsg) __THROW; #ifdef __USE_EXTERN_INLINES # ifndef _EXTERN_INLINE # define _EXTERN_INLINE extern __inline diff --git a/sysdeps/unix/sysv/linux/mips/sys/acct.h b/sysdeps/unix/sysv/linux/mips/sys/acct.h index ee596db..a17153c 100644 --- a/sysdeps/unix/sysv/linux/mips/sys/acct.h +++ b/sysdeps/unix/sysv/linux/mips/sys/acct.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2000 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 @@ -36,8 +36,8 @@ struct acct time_t ac_stime; /* Accounting system time. */ time_t ac_etime; /* Accounting elapsed time. */ time_t ac_btime; /* Beginning time. */ - long ac_uid; /* Accounting user ID. */ - long ac_gid; /* Accounting group ID. */ + long int ac_uid; /* Accounting user ID. */ + long int ac_gid; /* Accounting group ID. */ unsigned long int ac_tty; /* Controlling tty. */ /* Please note that the value of the `ac_tty' field, a device number, is encoded differently in the kernel and for the libc dev_t type. */ @@ -59,7 +59,7 @@ enum /* Switch process accounting on and off. */ -extern int acct __P ((__const char *__filename)); +extern int acct (__const char *__filename) __THROW; __END_DECLS diff --git a/sysdeps/unix/sysv/linux/mips/sys/cachectl.h b/sysdeps/unix/sysv/linux/mips/sys/cachectl.h index 740c24d..3bbd47c 100644 --- a/sysdeps/unix/sysv/linux/mips/sys/cachectl.h +++ b/sysdeps/unix/sysv/linux/mips/sys/cachectl.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2000 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 @@ -29,13 +29,13 @@ __BEGIN_DECLS #ifdef __USE_MISC -extern int cachectl __P ((void *addr, __const int nbytes, __const int op)); +extern int cachectl (void *addr, __const int nbytes, __const int op) __THROW; #endif -extern int __cachectl __P ((void *addr, __const int nbytes, __const int op)); +extern int __cachectl (void *addr, __const int nbytes, __const int op) __THROW; #ifdef __USE_MISC -extern int cacheflush __P ((void *addr, __const int nbytes, __const int op)); +extern int cacheflush (void *addr, __const int nbytes, __const int op) __THROW; #endif -extern int _flush_cache __P ((char *addr, __const int nbytes, __const int op)); +extern int _flush_cache (char *addr, __const int nbytes, __const int op) __THROW; __END_DECLS diff --git a/sysdeps/unix/sysv/linux/mips/sys/sysmips.h b/sysdeps/unix/sysv/linux/mips/sys/sysmips.h index cbb7eba..8afb149 100644 --- a/sysdeps/unix/sysv/linux/mips/sys/sysmips.h +++ b/sysdeps/unix/sysv/linux/mips/sys/sysmips.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 94, 95, 96, 97 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 94, 95, 96, 97, 2000 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 @@ -28,8 +28,8 @@ __BEGIN_DECLS -extern int sysmips __P ((__const int cmd, __const int arg1, - __const int arg2, __const int arg3)); +extern int sysmips (__const int cmd, __const int arg1, + __const int arg2, __const int arg3) __THROW; __END_DECLS -- 2.7.4