Module Name: src
Committed By: riz
Date: Thu Jul 16 18:27:22 UTC 2015
Modified Files:
src/sys/arch/alpha/include [netbsd-7]: ansi.h
src/sys/arch/hppa/include [netbsd-7]: ansi.h
src/sys/arch/i386/include [netbsd-7]: ansi.h
src/sys/arch/m68k/include [netbsd-7]: ansi.h
src/sys/arch/mips/include [netbsd-7]: ansi.h
src/sys/arch/powerpc/include [netbsd-7]: ansi.h
src/sys/arch/sh3/include [netbsd-7]: ansi.h
src/sys/arch/sparc/include [netbsd-7]: ansi.h
src/sys/arch/sparc64/include [netbsd-7]: ansi.h
src/sys/arch/usermode/include [netbsd-7]: ansi.h
Log Message:
Pull up following revision(s) (requested by martin in ticket #846):
sys/arch/mips/include/ansi.h: revision 1.29
sys/arch/sh3/include/ansi.h: revision 1.16
sys/arch/sparc64/include/ansi.h: revision 1.18
sys/arch/m68k/include/ansi.h: revision 1.24
sys/arch/powerpc/include/ansi.h: revision 1.30
sys/arch/hppa/include/ansi.h: revision 1.14
sys/arch/i386/include/ansi.h: revision 1.27
sys/arch/alpha/include/ansi.h: revision 1.25
sys/arch/usermode/include/ansi.h: revision 1.5
sys/arch/sparc/include/ansi.h: revision 1.24
Make _BSD_CLOCK_T_ unsigned int so it's the same for IPL32 and LP64
environments. We don't really have a powerpc64 native userland
and the mips64 native userland is IPL32 so this shouldn't affect anything.
Make clock_t unsigned
Make clock_t unsigned int everywhere.
Ok: matt@, mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.28.1 src/sys/arch/alpha/include/ansi.h
cvs rdiff -u -r1.13 -r1.13.28.1 src/sys/arch/hppa/include/ansi.h
cvs rdiff -u -r1.25 -r1.25.28.1 src/sys/arch/i386/include/ansi.h
cvs rdiff -u -r1.23 -r1.23.28.1 src/sys/arch/m68k/include/ansi.h
cvs rdiff -u -r1.28 -r1.28.28.1 src/sys/arch/mips/include/ansi.h
cvs rdiff -u -r1.29 -r1.29.28.1 src/sys/arch/powerpc/include/ansi.h
cvs rdiff -u -r1.15 -r1.15.28.1 src/sys/arch/sh3/include/ansi.h
cvs rdiff -u -r1.23 -r1.23.28.1 src/sys/arch/sparc/include/ansi.h
cvs rdiff -u -r1.17 -r1.17.28.1 src/sys/arch/sparc64/include/ansi.h
cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/arch/usermode/include/ansi.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/include/ansi.h
diff -u src/sys/arch/alpha/include/ansi.h:1.24 src/sys/arch/alpha/include/ansi.h:1.24.28.1
--- src/sys/arch/alpha/include/ansi.h:1.24 Sun Jul 17 20:54:36 2011
+++ src/sys/arch/alpha/include/ansi.h Thu Jul 16 18:27:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.24 2011/07/17 20:54:36 joerg Exp $ */
+/* $NetBSD: ansi.h,v 1.24.28.1 2015/07/16 18:27:22 riz Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -47,7 +47,7 @@
* #undef _BSD_SIZE_T_
* #endif
*/
-#define _BSD_CLOCK_T_ int /* 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 */
Index: src/sys/arch/hppa/include/ansi.h
diff -u src/sys/arch/hppa/include/ansi.h:1.13 src/sys/arch/hppa/include/ansi.h:1.13.28.1
--- src/sys/arch/hppa/include/ansi.h:1.13 Sun Jul 17 20:54:41 2011
+++ src/sys/arch/hppa/include/ansi.h Thu Jul 16 18:27:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.13 2011/07/17 20:54:41 joerg Exp $ */
+/* $NetBSD: ansi.h,v 1.13.28.1 2015/07/16 18:27:22 riz 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 */
Index: src/sys/arch/i386/include/ansi.h
diff -u src/sys/arch/i386/include/ansi.h:1.25 src/sys/arch/i386/include/ansi.h:1.25.28.1
--- src/sys/arch/i386/include/ansi.h:1.25 Sun Jul 17 20:54:41 2011
+++ src/sys/arch/i386/include/ansi.h Thu Jul 16 18:27:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.25 2011/07/17 20:54:41 joerg Exp $ */
+/* $NetBSD: ansi.h,v 1.25.28.1 2015/07/16 18:27:22 riz 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 */
Index: src/sys/arch/m68k/include/ansi.h
diff -u src/sys/arch/m68k/include/ansi.h:1.23 src/sys/arch/m68k/include/ansi.h:1.23.28.1
--- src/sys/arch/m68k/include/ansi.h:1.23 Sun Jul 17 20:54:43 2011
+++ src/sys/arch/m68k/include/ansi.h Thu Jul 16 18:27:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.23 2011/07/17 20:54:43 joerg Exp $ */
+/* $NetBSD: ansi.h,v 1.23.28.1 2015/07/16 18:27:22 riz 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 */
Index: src/sys/arch/mips/include/ansi.h
diff -u src/sys/arch/mips/include/ansi.h:1.28 src/sys/arch/mips/include/ansi.h:1.28.28.1
--- src/sys/arch/mips/include/ansi.h:1.28 Sun Jul 17 20:54:43 2011
+++ src/sys/arch/mips/include/ansi.h Thu Jul 16 18:27:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.28 2011/07/17 20:54:43 joerg Exp $ */
+/* $NetBSD: ansi.h,v 1.28.28.1 2015/07/16 18:27:22 riz 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() */
#ifndef __mips_o32
#define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */
#define _BSD_SIZE_T_ unsigned long /* sizeof() */
Index: src/sys/arch/powerpc/include/ansi.h
diff -u src/sys/arch/powerpc/include/ansi.h:1.29 src/sys/arch/powerpc/include/ansi.h:1.29.28.1
--- src/sys/arch/powerpc/include/ansi.h:1.29 Sun Jul 17 20:54:45 2011
+++ src/sys/arch/powerpc/include/ansi.h Thu Jul 16 18:27:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.29 2011/07/17 20:54:45 joerg Exp $ */
+/* $NetBSD: ansi.h,v 1.29.28.1 2015/07/16 18:27:22 riz 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() */
#ifdef _LP64
#define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */
#define _BSD_SIZE_T_ unsigned long /* sizeof() */
Index: src/sys/arch/sh3/include/ansi.h
diff -u src/sys/arch/sh3/include/ansi.h:1.15 src/sys/arch/sh3/include/ansi.h:1.15.28.1
--- src/sys/arch/sh3/include/ansi.h:1.15 Sun Jul 17 20:54:47 2011
+++ src/sys/arch/sh3/include/ansi.h Thu Jul 16 18:27:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.15 2011/07/17 20:54:47 joerg Exp $ */
+/* $NetBSD: ansi.h,v 1.15.28.1 2015/07/16 18:27:22 riz 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 */
Index: src/sys/arch/sparc/include/ansi.h
diff -u src/sys/arch/sparc/include/ansi.h:1.23 src/sys/arch/sparc/include/ansi.h:1.23.28.1
--- src/sys/arch/sparc/include/ansi.h:1.23 Sun Jul 17 20:54:47 2011
+++ src/sys/arch/sparc/include/ansi.h Thu Jul 16 18:27:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.23 2011/07/17 20:54:47 joerg Exp $ */
+/* $NetBSD: ansi.h,v 1.23.28.1 2015/07/16 18:27:22 riz 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 */
Index: src/sys/arch/sparc64/include/ansi.h
diff -u src/sys/arch/sparc64/include/ansi.h:1.17 src/sys/arch/sparc64/include/ansi.h:1.17.28.1
--- src/sys/arch/sparc64/include/ansi.h:1.17 Sun Jul 17 20:54:47 2011
+++ src/sys/arch/sparc64/include/ansi.h Thu Jul 16 18:27:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.17 2011/07/17 20:54:47 joerg Exp $ */
+/* $NetBSD: ansi.h,v 1.17.28.1 2015/07/16 18:27:22 riz Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -46,7 +46,7 @@
* #undef _BSD_SIZE_T_
* #endif
*/
-#define _BSD_CLOCK_T_ int /* 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 */
Index: src/sys/arch/usermode/include/ansi.h
diff -u src/sys/arch/usermode/include/ansi.h:1.4 src/sys/arch/usermode/include/ansi.h:1.4.4.1
--- src/sys/arch/usermode/include/ansi.h:1.4 Sun Nov 10 19:52:01 2013
+++ src/sys/arch/usermode/include/ansi.h Thu Jul 16 18:27:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.4 2013/11/10 19:52:01 jmcneill Exp $ */
+/* $NetBSD: ansi.h,v 1.4.4.1 2015/07/16 18:27:22 riz Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <[email protected]>
@@ -32,6 +32,7 @@
#include <sys/cdefs.h>
#include <machine/int_types.h>
+#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
