From e7a39282687b1b591a090ce2d84f30581be9834a Mon Sep 17 00:00:00 2001 From: martin Date: Wed, 17 Jun 2015 14:32:31 +0000 Subject: [PATCH] Make clock_t unsigned int everywhere. Ok: matt@, mrg@ --- sys/arch/hppa/include/ansi.h | 4 ++-- sys/arch/i386/include/ansi.h | 4 ++-- sys/arch/m68k/include/ansi.h | 4 ++-- sys/arch/sh3/include/ansi.h | 4 ++-- sys/arch/sparc/include/ansi.h | 4 ++-- sys/arch/usermode/include/ansi.h | 6 ++---- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/sys/arch/hppa/include/ansi.h b/sys/arch/hppa/include/ansi.h index ebf9754f3efb..532104449a2d 100644 --- a/sys/arch/hppa/include/ansi.h +++ b/sys/arch/hppa/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.13 2011/07/17 20:54:41 joerg Exp $ */ +/* $NetBSD: ansi.h,v 1.14 2015/06/17 14:32:31 martin Exp $ */ /* $OpenBSD: ansi.h,v 1.4 2000/02/22 17:29:12 millert Exp $ */ @@ -48,7 +48,7 @@ * #undef _BSD_SIZE_T_ * #endif */ -#define _BSD_CLOCK_T_ unsigned long int /* clock() */ +#define _BSD_CLOCK_T_ unsigned int /* clock() */ #define _BSD_PTRDIFF_T_ long int /* ptr1 - ptr2 */ #define _BSD_SIZE_T_ unsigned long int /* sizeof() */ #define _BSD_SSIZE_T_ long int /* byte count or error */ diff --git a/sys/arch/i386/include/ansi.h b/sys/arch/i386/include/ansi.h index ef4126ae5b32..b64c673eb5d3 100644 --- a/sys/arch/i386/include/ansi.h +++ b/sys/arch/i386/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.26 2014/12/09 14:39:49 pooka Exp $ */ +/* $NetBSD: ansi.h,v 1.27 2015/06/17 14:32:31 martin Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -47,7 +47,7 @@ * #undef _BSD_SIZE_T_ * #endif */ -#define _BSD_CLOCK_T_ unsigned long /* clock() */ +#define _BSD_CLOCK_T_ unsigned int /* clock() */ #define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ #define _BSD_SIZE_T_ unsigned int /* sizeof() */ #define _BSD_SSIZE_T_ int /* byte count or error */ diff --git a/sys/arch/m68k/include/ansi.h b/sys/arch/m68k/include/ansi.h index f7424f819637..f45419bba3b2 100644 --- a/sys/arch/m68k/include/ansi.h +++ b/sys/arch/m68k/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.23 2011/07/17 20:54:43 joerg Exp $ */ +/* $NetBSD: ansi.h,v 1.24 2015/06/17 14:32:31 martin Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,7 +46,7 @@ * #undef _BSD_SIZE_T_ * #endif */ -#define _BSD_CLOCK_T_ unsigned long /* clock() */ +#define _BSD_CLOCK_T_ unsigned int /* clock() */ #define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ #define _BSD_SIZE_T_ unsigned int /* sizeof() */ #define _BSD_SSIZE_T_ int /* byte count or error */ diff --git a/sys/arch/sh3/include/ansi.h b/sys/arch/sh3/include/ansi.h index b8e94e21e5f7..8b10ed3df933 100644 --- a/sys/arch/sh3/include/ansi.h +++ b/sys/arch/sh3/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.15 2011/07/17 20:54:47 joerg Exp $ */ +/* $NetBSD: ansi.h,v 1.16 2015/06/17 14:32:31 martin Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -45,7 +45,7 @@ * #undef _BSD_SIZE_T_ * #endif */ -#define _BSD_CLOCK_T_ unsigned long /* clock() */ +#define _BSD_CLOCK_T_ unsigned int /* clock() */ #define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ #define _BSD_SIZE_T_ unsigned int /* sizeof() */ #define _BSD_SSIZE_T_ int /* byte count or error */ diff --git a/sys/arch/sparc/include/ansi.h b/sys/arch/sparc/include/ansi.h index 3306f310b214..739f62d8f333 100644 --- a/sys/arch/sparc/include/ansi.h +++ b/sys/arch/sparc/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.23 2011/07/17 20:54:47 joerg Exp $ */ +/* $NetBSD: ansi.h,v 1.24 2015/06/17 14:32:32 martin Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,7 +46,7 @@ * #undef _BSD_SIZE_T_ * #endif */ -#define _BSD_CLOCK_T_ unsigned long /* clock() */ +#define _BSD_CLOCK_T_ unsigned int /* clock() */ #define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ #define _BSD_SIZE_T_ unsigned long /* sizeof() */ #define _BSD_SSIZE_T_ long /* byte count or error */ diff --git a/sys/arch/usermode/include/ansi.h b/sys/arch/usermode/include/ansi.h index 4591102ed119..2b8ba6dd57f4 100644 --- a/sys/arch/usermode/include/ansi.h +++ b/sys/arch/usermode/include/ansi.h @@ -1,4 +1,4 @@ -/* $NetBSD: ansi.h,v 1.4 2013/11/10 19:52:01 jmcneill Exp $ */ +/* $NetBSD: ansi.h,v 1.5 2015/06/17 14:32:32 martin Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill @@ -32,6 +32,7 @@ #include #include +#define _BSD_CLOCK_T_ unsigned int #define _BSD_TIME_T_ __int64_t #define _BSD_CLOCKID_T_ int #define _BSD_TIMER_T_ int @@ -41,17 +42,14 @@ #define _BSD_WINT_T_ int #if defined(__i386__) -#define _BSD_CLOCK_T_ unsigned long #define _BSD_PTRDIFF_T_ int #define _BSD_SIZE_T_ unsigned int #define _BSD_SSIZE_T_ int #elif defined(__x86_64__) -#define _BSD_CLOCK_T_ unsigned int #define _BSD_PTRDIFF_T_ long #define _BSD_SIZE_T_ unsigned long #define _BSD_SSIZE_T_ long #elif defined(__arm__) -#define _BSD_CLOCK_T_ unsigned int #define _BSD_PTRDIFF_T_ long int #define _BSD_SIZE_T_ unsigned long int #define _BSD_SSIZE_T_ long int