[src/trunk]: src/sys/arch/sh5/include Quell a bunch of compiler warnings by a...

[scw <scw%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d933096be9f2
branches:  trunk
changeset: 556113:d933096be9f2
user:      scw <scw%NetBSD.org@localhost>
date:      Sun Dec 07 20:01:58 2003 +0000

description:
Quell a bunch of compiler warnings by avoiding using 'long long'.

diffstat:

 sys/arch/sh5/include/mcontext.h |   8 ++------
 sys/arch/sh5/include/signal.h   |   8 ++------
 sys/arch/sh5/include/types.h    |  14 +++-----------
 3 files changed, 7 insertions(+), 23 deletions(-)

diffs (79 lines):

diff -r b5e06db35e45 -r d933096be9f2 sys/arch/sh5/include/mcontext.h
--- a/sys/arch/sh5/include/mcontext.h   Sun Dec 07 20:00:38 2003 +0000
+++ b/sys/arch/sh5/include/mcontext.h   Sun Dec 07 20:01:58 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mcontext.h,v 1.5 2003/10/08 22:43:01 thorpej Exp $     */
+/*     $NetBSD: mcontext.h,v 1.6 2003/12/07 20:01:58 scw Exp $ */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -58,11 +58,7 @@
 #define        _REG_SP         _REG_R(15)
 
 #ifndef __ASSEMBLER__
-#ifdef _LP64
-typedef        long            __greg_t;
-#else
-typedef long long      __greg_t;
-#endif
+typedef        __int64_t       __greg_t;
 typedef __greg_t       __gregset_t[_NGREG];
 
 /*
diff -r b5e06db35e45 -r d933096be9f2 sys/arch/sh5/include/signal.h
--- a/sys/arch/sh5/include/signal.h     Sun Dec 07 20:00:38 2003 +0000
+++ b/sys/arch/sh5/include/signal.h     Sun Dec 07 20:01:58 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: signal.h,v 1.10 2003/10/18 18:29:53 briggs Exp $       */
+/*     $NetBSD: signal.h,v 1.11 2003/12/07 20:01:58 scw Exp $  */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -46,11 +46,7 @@
 
 #include <sys/featuretest.h>
 
-#ifndef _LP64
-typedef long long      sig_atomic_t;
-#else
-typedef long   sig_atomic_t;
-#endif
+typedef __int64_t      sig_atomic_t;
 
 #define __HAVE_SIGINFO
 
diff -r b5e06db35e45 -r d933096be9f2 sys/arch/sh5/include/types.h
--- a/sys/arch/sh5/include/types.h      Sun Dec 07 20:00:38 2003 +0000
+++ b/sys/arch/sh5/include/types.h      Sun Dec 07 20:01:58 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.8 2003/09/26 22:46:01 nathanw Exp $        */
+/*     $NetBSD: types.h,v 1.9 2003/12/07 20:01:58 scw Exp $    */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -53,11 +53,7 @@
 typedef unsigned long  vsize_t;
 #endif
 
-#ifndef _LP64
-typedef unsigned long long     register_t;
-#else
-typedef unsigned long          register_t;
-#endif
+typedef __uint64_t     register_t;
 
 #if defined(_KERNEL)
 /*
@@ -75,11 +71,7 @@
 } label_t;
 #endif
 
-#ifndef _LP64
-typedef        __volatile long long    __cpu_simple_lock_t;
-#else
-typedef __volatile long                __cpu_simple_lock_t;
-#endif
+typedef        __volatile __int64_t    __cpu_simple_lock_t;
 
 #define        __SIMPLELOCK_LOCKED     1
 #define        __SIMPLELOCK_UNLOCKED   0