From 5a05b3676499a9cff845373803a953dde3ca3522 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 18 Aug 1999 03:42:39 +0000 Subject: Update. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Make __useconds_t unsigned. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/types.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise. * sysdeps/generic/bits/types.h: Make __useconds_t unsigned. * sysdeps/generic/ualarm.c (ualarm): Change return value and parameter type to useconds_t. * sysdeps/unix/bsd/ualarm.c: Likewise. * sysdeps/generic/usleep.c (usleep): Change parameter type to useconds_t. * sysdeps/unix/sysv/linux/usleep.c: Likewise. * sysdeps/mach/usleep.c: Likewise. --- ChangeLog | 18 ++++++++++++++++++ bits/types.h | 2 +- sysdeps/generic/bits/types.h | 2 +- sysdeps/generic/ualarm.c | 8 ++++---- sysdeps/generic/usleep.c | 4 ++-- sysdeps/mach/usleep.c | 4 ++-- sysdeps/unix/bsd/ualarm.c | 8 ++++---- sysdeps/unix/sysv/linux/alpha/bits/types.h | 2 +- sysdeps/unix/sysv/linux/bits/types.h | 2 +- sysdeps/unix/sysv/linux/mips/bits/types.h | 2 +- sysdeps/unix/sysv/linux/sparc/bits/types.h | 2 +- sysdeps/unix/sysv/linux/usleep.c | 4 ++-- sysdeps/unix/sysv/sysv4/solaris2/bits/types.h | 2 +- 13 files changed, 39 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index da353b1af1..911d319aba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,23 @@ 1999-08-17 Ulrich Drepper + * sysdeps/unix/sysv/linux/alpha/bits/types.h: Make __useconds_t + unsigned. + * sysdeps/unix/sysv/linux/bits/types.h: Likewise. + * sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/bits/types.h: Likewise. + * sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise. + + * sysdeps/generic/bits/types.h: Make __useconds_t unsigned. + + * sysdeps/generic/ualarm.c (ualarm): Change return value and + parameter type to useconds_t. + * sysdeps/unix/bsd/ualarm.c: Likewise. + + * sysdeps/generic/usleep.c (usleep): Change parameter type to + useconds_t. + * sysdeps/unix/sysv/linux/usleep.c: Likewise. + * sysdeps/mach/usleep.c: Likewise. + * locale/weight.h: Include . * posix/sys/types.h: Define type useconds_t if not done already. diff --git a/bits/types.h b/bits/types.h index 919e703cae..8d2061235d 100644 --- a/bits/types.h +++ b/bits/types.h @@ -80,7 +80,7 @@ typedef unsigned int __id_t; /* General type for IDs. */ typedef long int __daddr_t; /* The type of a disk address. */ typedef char *__caddr_t; typedef long int __time_t; -typedef int __useconds_t; +typedef unsigned int __useconds_t; typedef long int __suseconds_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ typedef long int __key_t; /* Type of an IPC key */ diff --git a/sysdeps/generic/bits/types.h b/sysdeps/generic/bits/types.h index 919e703cae..8d2061235d 100644 --- a/sysdeps/generic/bits/types.h +++ b/sysdeps/generic/bits/types.h @@ -80,7 +80,7 @@ typedef unsigned int __id_t; /* General type for IDs. */ typedef long int __daddr_t; /* The type of a disk address. */ typedef char *__caddr_t; typedef long int __time_t; -typedef int __useconds_t; +typedef unsigned int __useconds_t; typedef long int __suseconds_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ typedef long int __key_t; /* Type of an IPC key */ diff --git a/sysdeps/generic/ualarm.c b/sysdeps/generic/ualarm.c index b2c8da3c19..1f08b5792e 100644 --- a/sysdeps/generic/ualarm.c +++ b/sysdeps/generic/ualarm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 1999 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 @@ -24,10 +24,10 @@ off every INTERVAL microseconds thereafter. Returns the number of microseconds remaining before the alarm. */ -unsigned int +useconds_t ualarm (value, interval) - unsigned int value; - unsigned int interval; + useconds_t value; + useconds_t interval; { __set_errno (ENOSYS); return -1; diff --git a/sysdeps/generic/usleep.c b/sysdeps/generic/usleep.c index 9a8dadaed3..96e7c604bc 100644 --- a/sysdeps/generic/usleep.c +++ b/sysdeps/generic/usleep.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 1999 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 @@ -21,7 +21,7 @@ /* Sleep USECONDS microseconds, or until a previously set timer goes off. */ void usleep (useconds) - unsigned int useconds; + useconds_t< useconds; { } diff --git a/sysdeps/mach/usleep.c b/sysdeps/mach/usleep.c index b687784552..d09ab12ab2 100644 --- a/sysdeps/mach/usleep.c +++ b/sysdeps/mach/usleep.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 93, 94, 97, 98 Free Software Foundation, Inc. +/* Copyright (C) 1992, 93, 94, 97, 98, 99 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 @@ -23,7 +23,7 @@ /* Sleep USECONDS microseconds, or until a previously set timer goes off. */ void -usleep (unsigned int useconds) +usleep (useconds_t useconds) { mach_port_t recv; struct timeval before, after; diff --git a/sysdeps/unix/bsd/ualarm.c b/sysdeps/unix/bsd/ualarm.c index b9a1409bab..5fd4d79a9d 100644 --- a/sysdeps/unix/bsd/ualarm.c +++ b/sysdeps/unix/bsd/ualarm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997, 1999 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 @@ -24,10 +24,10 @@ off every INTERVAL microseconds thereafter. Returns the number of microseconds remaining before the alarm. */ -unsigned int +useconds_t ualarm (value, interval) - unsigned int value; - unsigned int interval; + useconds_t value; + useconds_t interval; { struct itimerval timer, otimer; diff --git a/sysdeps/unix/sysv/linux/alpha/bits/types.h b/sysdeps/unix/sysv/linux/alpha/bits/types.h index 096d92050c..4bc43199d5 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/types.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/types.h @@ -76,7 +76,7 @@ typedef struct typedef int __daddr_t; /* Type of a disk address. */ typedef char *__caddr_t; /* Type of a core address. */ typedef long int __time_t; -typedef int __useconds_t; +typedef unsigned int __useconds_t; typedef long int __suseconds_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ typedef long int __clock_t; diff --git a/sysdeps/unix/sysv/linux/bits/types.h b/sysdeps/unix/sysv/linux/bits/types.h index 0ff0cc58fa..1884baed96 100644 --- a/sysdeps/unix/sysv/linux/bits/types.h +++ b/sysdeps/unix/sysv/linux/bits/types.h @@ -81,8 +81,8 @@ typedef struct typedef int __daddr_t; /* The type of a disk address. */ typedef char *__caddr_t; typedef long int __time_t; +typedef unsigned int __useconds_t; typedef long int __suseconds_t; -typedef int __useconds_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ typedef long int __clock_t; diff --git a/sysdeps/unix/sysv/linux/mips/bits/types.h b/sysdeps/unix/sysv/linux/mips/bits/types.h index e1c436f319..d7176c31c6 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/types.h +++ b/sysdeps/unix/sysv/linux/mips/bits/types.h @@ -81,8 +81,8 @@ typedef struct typedef int __daddr_t; /* The type of a disk address. */ typedef char *__caddr_t; typedef long int __time_t; +typedef unsigned int __useconds_t; typedef long int __suseconds_t; -typedef int __useconds_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ typedef long int __clock_t; diff --git a/sysdeps/unix/sysv/linux/sparc/bits/types.h b/sysdeps/unix/sysv/linux/sparc/bits/types.h index 960594fb59..84073b7564 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/types.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/types.h @@ -98,7 +98,7 @@ typedef struct typedef int __daddr_t; /* The type of a disk address. */ typedef char *__caddr_t; typedef long int __time_t; -typedef int __useconds_t; +typedef unsigned int __useconds_t; typedef int __suseconds_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ diff --git a/sysdeps/unix/sysv/linux/usleep.c b/sysdeps/unix/sysv/linux/usleep.c index 9265897053..2f94a6cbcc 100644 --- a/sysdeps/unix/sysv/linux/usleep.c +++ b/sysdeps/unix/sysv/linux/usleep.c @@ -1,5 +1,5 @@ /* Implementation of the BSD usleep function using nanosleep. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -22,7 +22,7 @@ #include void -usleep (unsigned int useconds) +usleep (useconds_t useconds) { struct timespec ts = { tv_sec: (long int) (useconds / 1000000), tv_nsec: (long int) (useconds % 1000000) * 1000ul }; diff --git a/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h b/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h index ec1142c75f..79713e75ba 100644 --- a/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h +++ b/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h @@ -79,7 +79,7 @@ typedef unsigned int __id_t; /* General type for IDs. */ typedef long int __daddr_t; /* The type of a disk address. */ typedef char *__caddr_t; typedef long int __time_t; -typedef int __useconds_t; +typedef unsigned int __useconds_t; typedef int __suseconds_t; typedef long int __swblk_t; /* Type of a swap block maybe? */ typedef int __key_t; /* Type of an IPC key */ -- cgit 1.4.1