Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7]: src/sys/arch Pull up following revision(s) (requested by mart...



details:   https://anonhg.NetBSD.org/src/rev/dbeb181bf6c9
branches:  netbsd-7
changeset: 799468:dbeb181bf6c9
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Jul 16 18:27:22 2015 +0000

description:
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@

diffstat:

 sys/arch/alpha/include/ansi.h    |  4 ++--
 sys/arch/hppa/include/ansi.h     |  4 ++--
 sys/arch/i386/include/ansi.h     |  4 ++--
 sys/arch/m68k/include/ansi.h     |  4 ++--
 sys/arch/mips/include/ansi.h     |  4 ++--
 sys/arch/powerpc/include/ansi.h  |  4 ++--
 sys/arch/sh3/include/ansi.h      |  4 ++--
 sys/arch/sparc/include/ansi.h    |  4 ++--
 sys/arch/sparc64/include/ansi.h  |  4 ++--
 sys/arch/usermode/include/ansi.h |  6 ++----
 10 files changed, 20 insertions(+), 22 deletions(-)

diffs (197 lines):

diff -r 5241ec95c099 -r dbeb181bf6c9 sys/arch/alpha/include/ansi.h
--- a/sys/arch/alpha/include/ansi.h     Sat Jul 11 17:49:38 2015 +0000
+++ b/sys/arch/alpha/include/ansi.h     Thu Jul 16 18:27:22 2015 +0000
@@ -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 */
diff -r 5241ec95c099 -r dbeb181bf6c9 sys/arch/hppa/include/ansi.h
--- a/sys/arch/hppa/include/ansi.h      Sat Jul 11 17:49:38 2015 +0000
+++ b/sys/arch/hppa/include/ansi.h      Thu Jul 16 18:27:22 2015 +0000
@@ -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 */
diff -r 5241ec95c099 -r dbeb181bf6c9 sys/arch/i386/include/ansi.h
--- a/sys/arch/i386/include/ansi.h      Sat Jul 11 17:49:38 2015 +0000
+++ b/sys/arch/i386/include/ansi.h      Thu Jul 16 18:27:22 2015 +0000
@@ -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 */
diff -r 5241ec95c099 -r dbeb181bf6c9 sys/arch/m68k/include/ansi.h
--- a/sys/arch/m68k/include/ansi.h      Sat Jul 11 17:49:38 2015 +0000
+++ b/sys/arch/m68k/include/ansi.h      Thu Jul 16 18:27:22 2015 +0000
@@ -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 */
diff -r 5241ec95c099 -r dbeb181bf6c9 sys/arch/mips/include/ansi.h
--- a/sys/arch/mips/include/ansi.h      Sat Jul 11 17:49:38 2015 +0000
+++ b/sys/arch/mips/include/ansi.h      Thu Jul 16 18:27:22 2015 +0000
@@ -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() */
diff -r 5241ec95c099 -r dbeb181bf6c9 sys/arch/powerpc/include/ansi.h
--- a/sys/arch/powerpc/include/ansi.h   Sat Jul 11 17:49:38 2015 +0000
+++ b/sys/arch/powerpc/include/ansi.h   Thu Jul 16 18:27:22 2015 +0000
@@ -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() */
diff -r 5241ec95c099 -r dbeb181bf6c9 sys/arch/sh3/include/ansi.h
--- a/sys/arch/sh3/include/ansi.h       Sat Jul 11 17:49:38 2015 +0000
+++ b/sys/arch/sh3/include/ansi.h       Thu Jul 16 18:27:22 2015 +0000
@@ -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 */
diff -r 5241ec95c099 -r dbeb181bf6c9 sys/arch/sparc/include/ansi.h
--- a/sys/arch/sparc/include/ansi.h     Sat Jul 11 17:49:38 2015 +0000
+++ b/sys/arch/sparc/include/ansi.h     Thu Jul 16 18:27:22 2015 +0000
@@ -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 */
diff -r 5241ec95c099 -r dbeb181bf6c9 sys/arch/sparc64/include/ansi.h
--- a/sys/arch/sparc64/include/ansi.h   Sat Jul 11 17:49:38 2015 +0000
+++ b/sys/arch/sparc64/include/ansi.h   Thu Jul 16 18:27:22 2015 +0000
@@ -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 */
diff -r 5241ec95c099 -r dbeb181bf6c9 sys/arch/usermode/include/ansi.h
--- a/sys/arch/usermode/include/ansi.h  Sat Jul 11 17:49:38 2015 +0000
+++ b/sys/arch/usermode/include/ansi.h  Thu Jul 16 18:27:22 2015 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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



Home | Main Index | Thread Index | Old Index