summaryrefslogtreecommitdiff
path: root/lib/libc
diff options
context:
space:
mode:
authorperry <perry@NetBSD.org>2005-12-24 21:11:15 +0000
committerperry <perry@NetBSD.org>2005-12-24 21:11:15 +0000
commit4e11af46bc17850573de478d514cf2fdf8638bd7 (patch)
treec73b10dd6e35a0a7007ca003d9affeaedfcb0d9f /lib/libc
parent552b373ffa06138300a8b55dce0cef5c363aff86 (diff)
Remove leading __ from __(const|inline|signed|volatile) -- it is obsolete.
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/arch/arm/softfloat/arm-gcc.h4
-rw-r--r--lib/libc/arch/m68k/softfloat/m68k-gcc.h4
-rw-r--r--lib/libc/arch/powerpc/gen/fabs.c4
-rw-r--r--lib/libc/arch/powerpc/gen/flt_rounds.c6
-rw-r--r--lib/libc/arch/powerpc/gen/fpgetmask.c6
-rw-r--r--lib/libc/arch/powerpc/gen/fpgetround.c6
-rw-r--r--lib/libc/arch/powerpc/gen/fpgetsticky.c6
-rw-r--r--lib/libc/arch/powerpc/gen/fpsetmask.c8
-rw-r--r--lib/libc/arch/powerpc/gen/fpsetround.c8
-rw-r--r--lib/libc/arch/powerpc/gen/fpsetsticky.c8
-rw-r--r--lib/libc/arch/powerpc/gen/syncicache.c10
-rw-r--r--lib/libc/arch/powerpc/softfloat/powerpc-gcc.h4
-rw-r--r--lib/libc/arch/sh3/softfloat/sh3-gcc.h4
-rw-r--r--lib/libc/arch/sh5/gen/_lwp.c8
-rw-r--r--lib/libc/arch/sh5/gen/makecontext.c8
-rw-r--r--lib/libc/arch/sparc64/softfloat/sparc64-gcc.h4
-rw-r--r--lib/libc/compat-43/sigcompat.c12
-rw-r--r--lib/libc/gen/arc4random.c10
-rw-r--r--lib/libc/gen/fmtcheck.c6
-rw-r--r--lib/libc/gen/fnmatch.c6
-rw-r--r--lib/libc/gen/fstab.c8
-rw-r--r--lib/libc/stdlib/qsort.c12
-rw-r--r--lib/libc/stdlib/radixsort.c8
23 files changed, 77 insertions, 83 deletions
diff --git a/lib/libc/arch/arm/softfloat/arm-gcc.h b/lib/libc/arch/arm/softfloat/arm-gcc.h
index 0faebb8260d..c92086a7995 100644
--- a/lib/libc/arch/arm/softfloat/arm-gcc.h
+++ b/lib/libc/arch/arm/softfloat/arm-gcc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: arm-gcc.h,v 1.2 2001/02/21 18:09:25 bjh21 Exp $ */
+/* $NetBSD: arm-gcc.h,v 1.3 2005/12/24 21:11:16 perry Exp $ */
/*
-------------------------------------------------------------------------------
@@ -81,7 +81,7 @@ a compiler does not support explicit inlining, this macro should be defined
to be `static'.
-------------------------------------------------------------------------------
*/
-#define INLINE static __inline
+#define INLINE static inline
/*
-------------------------------------------------------------------------------
diff --git a/lib/libc/arch/m68k/softfloat/m68k-gcc.h b/lib/libc/arch/m68k/softfloat/m68k-gcc.h
index 3cb917bff1d..07bd45b3765 100644
--- a/lib/libc/arch/m68k/softfloat/m68k-gcc.h
+++ b/lib/libc/arch/m68k/softfloat/m68k-gcc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: m68k-gcc.h,v 1.1 2004/09/26 21:13:27 jmmv Exp $ */
+/* $NetBSD: m68k-gcc.h,v 1.2 2005/12/24 21:11:16 perry Exp $ */
/*
-------------------------------------------------------------------------------
@@ -83,7 +83,7 @@ a compiler does not support explicit inlining, this macro should be defined
to be `static'.
-------------------------------------------------------------------------------
*/
-#define INLINE static __inline
+#define INLINE static inline
#define FLOAT64_DEMANGLE(a) (a)
#define FLOAT64_MANGLE(a) (a)
diff --git a/lib/libc/arch/powerpc/gen/fabs.c b/lib/libc/arch/powerpc/gen/fabs.c
index d23013e4564..f2c9029948b 100644
--- a/lib/libc/arch/powerpc/gen/fabs.c
+++ b/lib/libc/arch/powerpc/gen/fabs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fabs.c,v 1.2 2001/05/25 12:28:12 tsubai Exp $ */
+/* $NetBSD: fabs.c,v 1.3 2005/12/24 21:11:16 perry Exp $ */
#include <math.h>
@@ -9,7 +9,7 @@ fabs(double x)
if (x < 0)
x = -x;
#else
- __asm__ __volatile("fabs %0,%1" : "=f"(x) : "f"(x));
+ __asm__ volatile("fabs %0,%1" : "=f"(x) : "f"(x));
#endif
return (x);
}
diff --git a/lib/libc/arch/powerpc/gen/flt_rounds.c b/lib/libc/arch/powerpc/gen/flt_rounds.c
index e8cfd6c925a..09b19c02c63 100644
--- a/lib/libc/arch/powerpc/gen/flt_rounds.c
+++ b/lib/libc/arch/powerpc/gen/flt_rounds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: flt_rounds.c,v 1.8 2005/06/12 05:21:26 lukem Exp $ */
+/* $NetBSD: flt_rounds.c,v 1.9 2005/12/24 21:11:16 perry Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.8 2005/06/12 05:21:26 lukem Exp $");
+__RCSID("$NetBSD: flt_rounds.c,v 1.9 2005/12/24 21:11:16 perry Exp $");
#endif /* LIBC_SCCS and not lint */
#include <ieeefp.h>
@@ -56,7 +56,7 @@ __flt_rounds(void)
#else
uint64_t fpscr;
- __asm__ __volatile("mffs %0" : "=f"(fpscr));
+ __asm__ volatile("mffs %0" : "=f"(fpscr));
return map[((uint32_t)fpscr & FPSCR_RN)];
#endif
}
diff --git a/lib/libc/arch/powerpc/gen/fpgetmask.c b/lib/libc/arch/powerpc/gen/fpgetmask.c
index 4b5e7a45a31..b1024049f97 100644
--- a/lib/libc/arch/powerpc/gen/fpgetmask.c
+++ b/lib/libc/arch/powerpc/gen/fpgetmask.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetmask.c,v 1.6 2005/06/12 05:21:26 lukem Exp $ */
+/* $NetBSD: fpgetmask.c,v 1.7 2005/12/24 21:11:16 perry Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetmask.c,v 1.6 2005/06/12 05:21:26 lukem Exp $");
+__RCSID("$NetBSD: fpgetmask.c,v 1.7 2005/12/24 21:11:16 perry Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -59,6 +59,6 @@ fpgetmask(void)
{
uint64_t fpscr;
- __asm__ __volatile("mffs %0" : "=f"(fpscr));
+ __asm__ volatile("mffs %0" : "=f"(fpscr));
return (((uint32_t)fpscr & MASKBITS) >> MASKSHFT);
}
diff --git a/lib/libc/arch/powerpc/gen/fpgetround.c b/lib/libc/arch/powerpc/gen/fpgetround.c
index 6ad627ab498..9dd6028f0a4 100644
--- a/lib/libc/arch/powerpc/gen/fpgetround.c
+++ b/lib/libc/arch/powerpc/gen/fpgetround.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetround.c,v 1.6 2005/06/12 05:21:26 lukem Exp $ */
+/* $NetBSD: fpgetround.c,v 1.7 2005/12/24 21:11:16 perry Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.6 2005/06/12 05:21:26 lukem Exp $");
+__RCSID("$NetBSD: fpgetround.c,v 1.7 2005/12/24 21:11:16 perry Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -59,6 +59,6 @@ fpgetround(void)
{
uint64_t fpscr;
- __asm__ __volatile("mffs %0" : "=f"(fpscr));
+ __asm__ volatile("mffs %0" : "=f"(fpscr));
return (((uint32_t)fpscr & ROUNDBITS) >> ROUNDSHFT);
}
diff --git a/lib/libc/arch/powerpc/gen/fpgetsticky.c b/lib/libc/arch/powerpc/gen/fpgetsticky.c
index 6d7013d5811..496b5ca4144 100644
--- a/lib/libc/arch/powerpc/gen/fpgetsticky.c
+++ b/lib/libc/arch/powerpc/gen/fpgetsticky.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetsticky.c,v 1.6 2005/06/12 05:21:26 lukem Exp $ */
+/* $NetBSD: fpgetsticky.c,v 1.7 2005/12/24 21:11:16 perry Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetsticky.c,v 1.6 2005/06/12 05:21:26 lukem Exp $");
+__RCSID("$NetBSD: fpgetsticky.c,v 1.7 2005/12/24 21:11:16 perry Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -59,6 +59,6 @@ fpgetsticky(void)
{
uint64_t fpscr;
- __asm__ __volatile("mffs %0" : "=f"(fpscr));
+ __asm__ volatile("mffs %0" : "=f"(fpscr));
return (((uint32_t)fpscr & STICKYBITS) >> STICKYSHFT);
}
diff --git a/lib/libc/arch/powerpc/gen/fpsetmask.c b/lib/libc/arch/powerpc/gen/fpsetmask.c
index a5d49a22cbc..f733dd3ac91 100644
--- a/lib/libc/arch/powerpc/gen/fpsetmask.c
+++ b/lib/libc/arch/powerpc/gen/fpsetmask.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetmask.c,v 1.6 2005/06/12 05:21:26 lukem Exp $ */
+/* $NetBSD: fpsetmask.c,v 1.7 2005/12/24 21:11:16 perry Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetmask.c,v 1.6 2005/06/12 05:21:26 lukem Exp $");
+__RCSID("$NetBSD: fpsetmask.c,v 1.7 2005/12/24 21:11:16 perry Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -60,10 +60,10 @@ fpsetmask(fp_except mask)
uint64_t fpscr;
fp_except old;
- __asm__ __volatile("mffs %0" : "=f"(fpscr));
+ __asm__ volatile("mffs %0" : "=f"(fpscr));
old = ((uint32_t)fpscr & MASKBITS) >> MASKSHFT;
fpscr &= ~MASKBITS;
fpscr |= ((uint32_t)mask << MASKSHFT) & MASKBITS;
- __asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr));
+ __asm__ volatile("mtfsf 0xff,%0" :: "f"(fpscr));
return (old);
}
diff --git a/lib/libc/arch/powerpc/gen/fpsetround.c b/lib/libc/arch/powerpc/gen/fpsetround.c
index 39ea96527f7..dd18c0dde49 100644
--- a/lib/libc/arch/powerpc/gen/fpsetround.c
+++ b/lib/libc/arch/powerpc/gen/fpsetround.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetround.c,v 1.6 2005/06/12 05:21:26 lukem Exp $ */
+/* $NetBSD: fpsetround.c,v 1.7 2005/12/24 21:11:16 perry Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.6 2005/06/12 05:21:26 lukem Exp $");
+__RCSID("$NetBSD: fpsetround.c,v 1.7 2005/12/24 21:11:16 perry Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -59,10 +59,10 @@ fpsetround(fp_rnd rnd_dir)
uint64_t fpscr;
fp_rnd old;
- __asm__ __volatile("mffs %0" : "=f"(fpscr));
+ __asm__ volatile("mffs %0" : "=f"(fpscr));
old = (uint32_t)fpscr & ROUNDBITS;
fpscr &= ~ROUNDBITS;
fpscr |= rnd_dir & ROUNDBITS;
- __asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr));
+ __asm__ volatile("mtfsf 0xff,%0" :: "f"(fpscr));
return (old);
}
diff --git a/lib/libc/arch/powerpc/gen/fpsetsticky.c b/lib/libc/arch/powerpc/gen/fpsetsticky.c
index 14980709e5d..350f5249cdb 100644
--- a/lib/libc/arch/powerpc/gen/fpsetsticky.c
+++ b/lib/libc/arch/powerpc/gen/fpsetsticky.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetsticky.c,v 1.7 2005/06/12 05:21:26 lukem Exp $ */
+/* $NetBSD: fpsetsticky.c,v 1.8 2005/12/24 21:11:16 perry Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetsticky.c,v 1.7 2005/06/12 05:21:26 lukem Exp $");
+__RCSID("$NetBSD: fpsetsticky.c,v 1.8 2005/12/24 21:11:16 perry Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -63,7 +63,7 @@ fpsetsticky(fp_except mask)
uint64_t fpscr;
fp_except old;
- __asm__ __volatile("mffs %0" : "=f"(fpscr));
+ __asm__ volatile("mffs %0" : "=f"(fpscr));
old = ((uint32_t)fpscr & STICKYBITS) >> STICKYSHFT;
/*
* FPSCR_VX (aka FP_X_INV) is not a sticky bit but a summary of the
@@ -86,6 +86,6 @@ fpsetsticky(fp_except mask)
/*
* Write back the fpscr.
*/
- __asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr));
+ __asm__ volatile("mtfsf 0xff,%0" :: "f"(fpscr));
return (old);
}
diff --git a/lib/libc/arch/powerpc/gen/syncicache.c b/lib/libc/arch/powerpc/gen/syncicache.c
index 4e0bd22bc5a..3eb01d9377c 100644
--- a/lib/libc/arch/powerpc/gen/syncicache.c
+++ b/lib/libc/arch/powerpc/gen/syncicache.c
@@ -1,4 +1,4 @@
-/* $NetBSD: syncicache.c,v 1.12 2003/08/11 02:11:23 matt Exp $ */
+/* $NetBSD: syncicache.c,v 1.13 2005/12/24 21:11:16 perry Exp $ */
/*
* Copyright (C) 1995-1997, 1999 Wolfgang Solfrank.
@@ -118,11 +118,11 @@ __syncicache(void *from, size_t len)
l = (len + off + linesz - 1) & ~(linesz - 1);
p = (char *)from - off;
do {
- __asm__ __volatile ("dcbst 0,%0" :: "r"(p));
+ __asm__ volatile ("dcbst 0,%0" :: "r"(p));
p += linesz;
} while ((l -= linesz) != 0);
}
- __asm__ __volatile ("sync");
+ __asm__ volatile ("sync");
if (CACHEINFO.icache_size > 0 ) {
linesz = CACHEINFO.icache_line_size;
@@ -130,9 +130,9 @@ __syncicache(void *from, size_t len)
l = (len + off + linesz - 1) & ~(linesz - 1);
p = (char *)from - off;
do {
- __asm__ __volatile ("icbi 0,%0" :: "r"(p));
+ __asm__ volatile ("icbi 0,%0" :: "r"(p));
p += linesz;
} while ((l -= linesz) != 0);
}
- __asm__ __volatile ("sync; isync");
+ __asm__ volatile ("sync; isync");
}
diff --git a/lib/libc/arch/powerpc/softfloat/powerpc-gcc.h b/lib/libc/arch/powerpc/softfloat/powerpc-gcc.h
index d733ebad717..9a178421178 100644
--- a/lib/libc/arch/powerpc/softfloat/powerpc-gcc.h
+++ b/lib/libc/arch/powerpc/softfloat/powerpc-gcc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc-gcc.h,v 1.1 2001/05/25 11:38:57 simonb Exp $ */
+/* $NetBSD: powerpc-gcc.h,v 1.2 2005/12/24 21:11:16 perry Exp $ */
/*
-------------------------------------------------------------------------------
@@ -83,7 +83,7 @@ a compiler does not support explicit inlining, this macro should be defined
to be `static'.
-------------------------------------------------------------------------------
*/
-#define INLINE static __inline
+#define INLINE static inline
#define FLOAT64_DEMANGLE(a) (a)
#define FLOAT64_MANGLE(a) (a)
diff --git a/lib/libc/arch/sh3/softfloat/sh3-gcc.h b/lib/libc/arch/sh3/softfloat/sh3-gcc.h
index bb65d5745fd..15c168aa94c 100644
--- a/lib/libc/arch/sh3/softfloat/sh3-gcc.h
+++ b/lib/libc/arch/sh3/softfloat/sh3-gcc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sh3-gcc.h,v 1.1 2000/06/06 17:28:42 tsubai Exp $ */
+/* $NetBSD: sh3-gcc.h,v 1.2 2005/12/24 21:11:16 perry Exp $ */
/*
-------------------------------------------------------------------------------
@@ -83,7 +83,7 @@ a compiler does not support explicit inlining, this macro should be defined
to be `static'.
-------------------------------------------------------------------------------
*/
-#define INLINE static __inline
+#define INLINE static inline
#define FLOAT64_DEMANGLE(a) (a)
#define FLOAT64_MANGLE(a) (a)
diff --git a/lib/libc/arch/sh5/gen/_lwp.c b/lib/libc/arch/sh5/gen/_lwp.c
index 18c58332a1f..3c7dafa0073 100644
--- a/lib/libc/arch/sh5/gen/_lwp.c
+++ b/lib/libc/arch/sh5/gen/_lwp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: _lwp.c,v 1.5 2005/06/12 05:21:26 lukem Exp $ */
+/* $NetBSD: _lwp.c,v 1.6 2005/12/24 21:11:16 perry Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.5 2005/06/12 05:21:26 lukem Exp $");
+__RCSID("$NetBSD: _lwp.c,v 1.6 2005/12/24 21:11:16 perry Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -77,9 +77,9 @@ _lwp_makecontext(ucontext_t *u, void (*start)(void *),
* XXXSCW: I've never actually seen these used anywhere, so this
* may well be unnecessary...
*/
- __asm __volatile("or r26, r63, %0" : "=r"(r));
+ __asm volatile("or r26, r63, %0" : "=r"(r));
gr[_REG_R(26)] = r;
- __asm __volatile("or r27, r63, %0" : "=r"(r));
+ __asm volatile("or r27, r63, %0" : "=r"(r));
gr[_REG_R(27)] = r;
/*
diff --git a/lib/libc/arch/sh5/gen/makecontext.c b/lib/libc/arch/sh5/gen/makecontext.c
index caa4b0292ac..692a8bf3aaf 100644
--- a/lib/libc/arch/sh5/gen/makecontext.c
+++ b/lib/libc/arch/sh5/gen/makecontext.c
@@ -1,4 +1,4 @@
-/* $NetBSD: makecontext.c,v 1.4 2003/01/22 13:44:36 scw Exp $ */
+/* $NetBSD: makecontext.c,v 1.5 2005/12/24 21:11:16 perry Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.4 2003/01/22 13:44:36 scw Exp $");
+__RCSID("$NetBSD: makecontext.c,v 1.5 2005/12/24 21:11:16 perry Exp $");
#endif
#include <sys/types.h>
@@ -76,9 +76,9 @@ makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
* XXXSCW: I've never actually seen these used anywhere, so this
* may well be unnecessary...
*/
- __asm __volatile("or r26, r63, %0" : "=r"(r));
+ __asm volatile("or r26, r63, %0" : "=r"(r));
gr[_REG_R(26)] = r;
- __asm __volatile("or r27, r63, %0" : "=r"(r));
+ __asm volatile("or r27, r63, %0" : "=r"(r));
gr[_REG_R(27)] = r;
/*
diff --git a/lib/libc/arch/sparc64/softfloat/sparc64-gcc.h b/lib/libc/arch/sparc64/softfloat/sparc64-gcc.h
index e416e9b2d7a..778e9d0e379 100644
--- a/lib/libc/arch/sparc64/softfloat/sparc64-gcc.h
+++ b/lib/libc/arch/sparc64/softfloat/sparc64-gcc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sparc64-gcc.h,v 1.1 2002/02/05 07:53:07 jmc Exp $ */
+/* $NetBSD: sparc64-gcc.h,v 1.2 2005/12/24 21:11:16 perry Exp $ */
/*
-------------------------------------------------------------------------------
@@ -83,7 +83,7 @@ a compiler does not support explicit inlining, this macro should be defined
to be `static'.
-------------------------------------------------------------------------------
*/
-#define INLINE static __inline
+#define INLINE static inline
#define FLOAT64_DEMANGLE(a) (a)
#define FLOAT64_MANGLE(a) (a)
diff --git a/lib/libc/compat-43/sigcompat.c b/lib/libc/compat-43/sigcompat.c
index 19dca70a0f1..a8ae696ff37 100644
--- a/lib/libc/compat-43/sigcompat.c
+++ b/lib/libc/compat-43/sigcompat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sigcompat.c,v 1.12 2005/09/13 01:44:09 christos Exp $ */
+/* $NetBSD: sigcompat.c,v 1.13 2005/12/24 21:11:16 perry Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)sigcompat.c 8.1 (Berkeley) 6/2/93";
#else
-__RCSID("$NetBSD: sigcompat.c,v 1.12 2005/09/13 01:44:09 christos Exp $");
+__RCSID("$NetBSD: sigcompat.c,v 1.13 2005/12/24 21:11:16 perry Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -42,10 +42,10 @@ __RCSID("$NetBSD: sigcompat.c,v 1.12 2005/09/13 01:44:09 christos Exp $");
#include <signal.h>
#include <compat/sys/signal.h>
-static __inline void sv2sa(struct sigaction *, const struct sigvec *);
-static __inline void sa2sv(struct sigvec *, const struct sigaction *);
+static inline void sv2sa(struct sigaction *, const struct sigvec *);
+static inline void sa2sv(struct sigvec *, const struct sigaction *);
-static __inline void
+static inline void
sv2sa(struct sigaction *sa, const struct sigvec *sv)
{
sigemptyset(&sa->sa_mask);
@@ -54,7 +54,7 @@ sv2sa(struct sigaction *sa, const struct sigvec *sv)
sa->sa_flags = sv->sv_flags ^ SV_INTERRUPT; /* !SA_INTERRUPT */
}
-static __inline void
+static inline void
sa2sv(struct sigvec *sv, const struct sigaction *sa)
{
sv->sv_mask = sa->sa_mask.__bits[0];
diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c
index 1d4d5d323eb..1b9f2229df3 100644
--- a/lib/libc/gen/arc4random.c
+++ b/lib/libc/gen/arc4random.c
@@ -1,4 +1,4 @@
-/* $NetBSD: arc4random.c,v 1.8 2005/06/12 05:21:27 lukem Exp $ */
+/* $NetBSD: arc4random.c,v 1.9 2005/12/24 21:11:16 perry Exp $ */
/* $OpenBSD: arc4random.c,v 1.6 2001/06/05 05:05:38 pvalchev Exp $ */
/*
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: arc4random.c,v 1.8 2005/06/12 05:21:27 lukem Exp $");
+__RCSID("$NetBSD: arc4random.c,v 1.9 2005/12/24 21:11:16 perry Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -43,12 +43,6 @@ __RCSID("$NetBSD: arc4random.c,v 1.8 2005/06/12 05:21:27 lukem Exp $");
__weak_alias(arc4random,_arc4random)
#endif
-#ifdef __GNUC__
-#define inline __inline
-#else /* !__GNUC__ */
-#define inline
-#endif /* !__GNUC__ */
-
struct arc4_stream {
u_int8_t i;
u_int8_t j;
diff --git a/lib/libc/gen/fmtcheck.c b/lib/libc/gen/fmtcheck.c
index 8d86acb3e89..28c17a93c95 100644
--- a/lib/libc/gen/fmtcheck.c
+++ b/lib/libc/gen/fmtcheck.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fmtcheck.c,v 1.6 2004/10/28 21:14:52 dsl Exp $ */
+/* $NetBSD: fmtcheck.c,v 1.7 2005/12/24 21:11:16 perry Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fmtcheck.c,v 1.6 2004/10/28 21:14:52 dsl Exp $");
+__RCSID("$NetBSD: fmtcheck.c,v 1.7 2005/12/24 21:11:16 perry Exp $");
#endif
#include "namespace.h"
@@ -227,7 +227,7 @@ get_next_format(const char **pf, EFT eft)
/*NOTREACHED*/
}
-__const char *
+const char *
fmtcheck(const char *f1, const char *f2)
{
const char *f1p, *f2p;
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c
index 2a13c0e0aca..556cae7bcf4 100644
--- a/lib/libc/gen/fnmatch.c
+++ b/lib/libc/gen/fnmatch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fnmatch.c,v 1.20 2003/08/07 16:42:48 agc Exp $ */
+/* $NetBSD: fnmatch.c,v 1.21 2005/12/24 21:11:16 perry Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94";
#else
-__RCSID("$NetBSD: fnmatch.c,v 1.20 2003/08/07 16:42:48 agc Exp $");
+__RCSID("$NetBSD: fnmatch.c,v 1.21 2005/12/24 21:11:16 perry Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,7 +61,7 @@ __weak_alias(fnmatch,_fnmatch)
static const char *rangematch __P((const char *, int, int));
-static __inline int
+static inline int
foldcase(int ch, int flags)
{
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
index 56c3d512777..bad42ff4f12 100644
--- a/lib/libc/gen/fstab.c
+++ b/lib/libc/gen/fstab.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fstab.c,v 1.26 2005/11/29 03:11:59 christos Exp $ */
+/* $NetBSD: fstab.c,v 1.27 2005/12/24 21:11:16 perry Exp $ */
/*
* Copyright (c) 1980, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)fstab.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fstab.c,v 1.26 2005/11/29 03:11:59 christos Exp $");
+__RCSID("$NetBSD: fstab.c,v 1.27 2005/12/24 21:11:16 perry Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -65,10 +65,10 @@ static struct fstab _fs_fstab;
static int fstabscan __P((void));
-static __inline char *nextfld __P((char **, const char *));
+static inline char *nextfld __P((char **, const char *));
-static __inline char *
+static inline char *
nextfld(str, sep)
char **str;
const char *sep;
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index 4f23189018f..637ad30e511 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qsort.c,v 1.13 2003/08/07 16:43:42 agc Exp $ */
+/* $NetBSD: qsort.c,v 1.14 2005/12/24 21:11:16 perry Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)qsort.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: qsort.c,v 1.13 2003/08/07 16:43:42 agc Exp $");
+__RCSID("$NetBSD: qsort.c,v 1.14 2005/12/24 21:11:16 perry Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -44,9 +44,9 @@ __RCSID("$NetBSD: qsort.c,v 1.13 2003/08/07 16:43:42 agc Exp $");
#include <errno.h>
#include <stdlib.h>
-static __inline char *med3 __P((char *, char *, char *,
+static inline char *med3 __P((char *, char *, char *,
int (*)(const void *, const void *)));
-static __inline void swapfunc __P((char *, char *, size_t, int));
+static inline void swapfunc __P((char *, char *, size_t, int));
#define min(a, b) (a) < (b) ? a : b
@@ -67,7 +67,7 @@ static __inline void swapfunc __P((char *, char *, size_t, int));
#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-static __inline void
+static inline void
swapfunc(a, b, n, swaptype)
char *a, *b;
size_t n;
@@ -89,7 +89,7 @@ swapfunc(a, b, n, swaptype)
#define vecswap(a, b, n) if ((n) > 0) swapfunc((a), (b), (size_t)(n), swaptype)
-static __inline char *
+static inline char *
med3(a, b, c, cmp)
char *a, *b, *c;
int (*cmp) __P((const void *, const void *));
diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c
index e775ecba352..47e9fbd429b 100644
--- a/lib/libc/stdlib/radixsort.c
+++ b/lib/libc/stdlib/radixsort.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radixsort.c,v 1.15 2003/08/07 16:43:43 agc Exp $ */
+/* $NetBSD: radixsort.c,v 1.16 2005/12/24 21:11:16 perry Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)radixsort.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: radixsort.c,v 1.15 2003/08/07 16:43:43 agc Exp $");
+__RCSID("$NetBSD: radixsort.c,v 1.16 2005/12/24 21:11:16 perry Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -71,7 +71,7 @@ typedef struct {
int sn, si;
} stack;
-static __inline void simplesort
+static inline void simplesort
__P((const u_char **, int, int, const u_char *, u_int));
static void r_sort_a __P((const u_char **, int, int, const u_char *, u_int));
static void r_sort_b __P((const u_char **,
@@ -322,7 +322,7 @@ r_sort_b(a, ta, n, i, tr, endch)
}
}
-static __inline void
+static inline void
simplesort(a, n, b, tr, endch) /* insertion sort */
const u_char **a;
int n, b;