Source-Changes-HG archive

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

[src/trunk]: src/sys/sys s/static inline/static __inline/g for c...



details:   https://anonhg.NetBSD.org/src/rev/f393ff024f6d
branches:  trunk
changeset: 318374:f393ff024f6d
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Apr 19 21:19:07 2018 +0000
description:
s/static inline/static __inline/g for consistency with other include
headers.

diffstat:

 sys/sys/bus.h        |   8 +++---
 sys/sys/clock.h      |   8 +++---
 sys/sys/cprng.h      |   8 +++---
 sys/sys/cpu.h        |   6 ++--
 sys/sys/dtrace_bsd.h |  26 ++++++++++++------------
 sys/sys/gcq.h        |  54 ++++++++++++++++++++++++++--------------------------
 sys/sys/kernhist.h   |   4 +-
 sys/sys/ktrace.h     |  38 ++++++++++++++++++------------------
 sys/sys/lwp.h        |  34 ++++++++++++++++----------------
 sys/sys/msgbuf.h     |   4 +-
 sys/sys/pmf.h        |   8 +++---
 sys/sys/proc.h       |   4 +-
 sys/sys/pslist.h     |  34 ++++++++++++++++----------------
 sys/sys/rndsource.h  |  10 ++++----
 sys/sys/signalvar.h  |   8 +++---
 sys/sys/sleepq.h     |  10 ++++----
 sys/sys/socket.h     |   4 +-
 sys/sys/socketvar.h  |  24 +++++++++++-----------
 sys/sys/syscallvar.h |   6 ++--
 sys/sys/timevar.h    |   6 ++--
 sys/sys/vnode.h      |   6 ++--
 21 files changed, 155 insertions(+), 155 deletions(-)

diffs (truncated from 1289 to 300 lines):

diff -r f66eed7ea209 -r f393ff024f6d sys/sys/bus.h
--- a/sys/sys/bus.h     Thu Apr 19 18:19:17 2018 +0000
+++ b/sys/sys/bus.h     Thu Apr 19 21:19:07 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.h,v 1.11 2012/05/07 18:16:38 tsutsui Exp $ */
+/*     $NetBSD: bus.h,v 1.12 2018/04/19 21:19:07 christos Exp $        */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -42,13 +42,13 @@
 
 typedef struct bus_space_reservation bus_space_reservation_t;
 
-static inline bus_size_t
+static __inline bus_size_t
 bus_space_reservation_size(bus_space_reservation_t *bsr)
 {
        return bsr->_bsr_size;
 }
 
-static inline bus_space_reservation_t *
+static __inline bus_space_reservation_t *
 bus_space_reservation_init(bus_space_reservation_t *bsr,
     bus_addr_t addr, bus_size_t size)
 {
@@ -57,7 +57,7 @@
        return bsr;
 }
 
-static inline bus_addr_t
+static __inline bus_addr_t
 bus_space_reservation_addr(bus_space_reservation_t *bsr)
 {
        return bsr->_bsr_start;
diff -r f66eed7ea209 -r f393ff024f6d sys/sys/clock.h
--- a/sys/sys/clock.h   Thu Apr 19 18:19:17 2018 +0000
+++ b/sys/sys/clock.h   Thu Apr 19 21:19:07 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.h,v 1.3 2014/11/17 17:11:29 christos Exp $       */
+/*     $NetBSD: clock.h,v 1.4 2018/04/19 21:19:07 christos Exp $       */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
 #define        POSIX_BASE_YEAR 1970
 
 /* Some handy functions */
-static inline int
+static __inline int
 days_in_month(int m)
 {
        switch (m) {
@@ -68,7 +68,7 @@
  *     ((year % 400) == 0) )
  * It is otherwise equivalent.
  */
-static inline int
+static __inline int
 is_leap_year(uint64_t year)
 {
        if ((year & 3) != 0)
@@ -80,7 +80,7 @@
        return __predict_false((year % 400) == 0);
 }
 
-static inline int
+static __inline int
 days_per_year(uint64_t year)
 {
        return is_leap_year(year) ? DAYS_PER_LEAP_YEAR : DAYS_PER_COMMON_YEAR;
diff -r f66eed7ea209 -r f393ff024f6d sys/sys/cprng.h
--- a/sys/sys/cprng.h   Thu Apr 19 18:19:17 2018 +0000
+++ b/sys/sys/cprng.h   Thu Apr 19 21:19:07 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cprng.h,v 1.12 2015/04/13 15:51:30 riastradh Exp $ */
+/*     $NetBSD: cprng.h,v 1.13 2018/04/19 21:19:07 christos Exp $ */
 
 /*-
  * Copyright (c) 2011-2013 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
 
 extern cprng_strong_t  *kern_cprng;
 
-static inline uint32_t
+static __inline uint32_t
 cprng_strong32(void)
 {
        uint32_t r;
@@ -79,7 +79,7 @@
        return r;
 }
 
-static inline uint64_t
+static __inline uint64_t
 cprng_strong64(void)
 {
        uint64_t r;
@@ -87,7 +87,7 @@
        return r;
 }
 
-static inline unsigned int
+static __inline unsigned int
 cprng_strong_strength(cprng_strong_t *c)
 {
        return NIST_BLOCK_KEYLEN_BYTES;
diff -r f66eed7ea209 -r f393ff024f6d sys/sys/cpu.h
--- a/sys/sys/cpu.h     Thu Apr 19 18:19:17 2018 +0000
+++ b/sys/sys/cpu.h     Thu Apr 19 21:19:07 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.42 2017/12/16 00:37:51 mrg Exp $     */
+/*     $NetBSD: cpu.h,v 1.43 2018/04/19 21:19:07 christos Exp $        */
 
 /*-
  * Copyright (c) 2007 YAMAMOTO Takashi,
@@ -108,13 +108,13 @@
 extern kcpuset_t *kcpuset_attached;
 extern kcpuset_t *kcpuset_running;
 
-static inline u_int
+static __inline u_int
 cpu_index(const struct cpu_info *ci)
 {
        return ci->ci_index;
 }
 
-static inline char *
+static __inline char *
 cpu_name(struct cpu_info *ci)
 {
        return ci->ci_data.cpu_name;
diff -r f66eed7ea209 -r f393ff024f6d sys/sys/dtrace_bsd.h
--- a/sys/sys/dtrace_bsd.h      Thu Apr 19 18:19:17 2018 +0000
+++ b/sys/sys/dtrace_bsd.h      Thu Apr 19 21:19:07 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dtrace_bsd.h,v 1.8 2014/10/18 08:33:29 snj Exp $       */
+/*     $NetBSD: dtrace_bsd.h,v 1.9 2018/04/19 21:19:07 christos Exp $  */
 
 /*-
  * Copyright (c) 2007-2008 John Birrell (jb%freebsd.org@localhost)
@@ -169,16 +169,16 @@
  * processes and lwps.
  */
 
-static inline size_t   kdtrace_proc_size(void);
-static inline void kdtrace_proc_ctor(void *, struct proc *);
-static inline void kdtrace_proc_dtor(void *, struct proc *);
-static inline size_t   kdtrace_thread_size(void);
-static inline void kdtrace_thread_ctor(void *, struct lwp *);
-static inline void kdtrace_thread_dtor(void *, struct lwp *);
+static __inline size_t kdtrace_proc_size(void);
+static __inline void kdtrace_proc_ctor(void *, struct proc *);
+static __inline void kdtrace_proc_dtor(void *, struct proc *);
+static __inline size_t kdtrace_thread_size(void);
+static __inline void kdtrace_thread_ctor(void *, struct lwp *);
+static __inline void kdtrace_thread_dtor(void *, struct lwp *);
 
 
 /* Return the DTrace process data size compiled in the kernel hooks. */
-static inline size_t
+static __inline size_t
 kdtrace_proc_size(void)
 {
 
@@ -186,14 +186,14 @@
 }
 
 /* Return the DTrace thread data size compiled in the kernel hooks. */
-static inline size_t
+static __inline size_t
 kdtrace_thread_size(void)
 {
 
        return KDTRACE_THREAD_SIZE;
 }
 
-static inline void
+static __inline void
 kdtrace_proc_ctor(void *arg, struct proc *p)
 {
 
@@ -202,7 +202,7 @@
 #endif
 }
 
-static inline void
+static __inline void
 kdtrace_proc_dtor(void *arg, struct proc *p)
 {
 
@@ -214,7 +214,7 @@
 #endif
 }
 
-static inline void
+static __inline void
 kdtrace_thread_ctor(void *arg, struct lwp *l)
 {
 
@@ -223,7 +223,7 @@
 #endif
 }
 
-static inline void
+static __inline void
 kdtrace_thread_dtor(void *arg, struct lwp *l)
 {
 
diff -r f66eed7ea209 -r f393ff024f6d sys/sys/gcq.h
--- a/sys/sys/gcq.h     Thu Apr 19 18:19:17 2018 +0000
+++ b/sys/sys/gcq.h     Thu Apr 19 21:19:07 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gcq.h,v 1.2 2007/08/19 07:35:32 kiyohara Exp $ */
+/* $NetBSD: gcq.h,v 1.3 2018/04/19 21:19:07 christos Exp $ */
 /*
  * Not (c) 2007 Matthew Orgass
  * This file is public domain, meaning anyone can make any use of part or all 
@@ -50,61 +50,61 @@
 #define GCQ_INIT(q) { &(q), &(q) }
 #define GCQ_INIT_HEAD(head) { GCQ_INIT((head).hq) }
 
-__attribute__((nonnull, always_inline)) static inline void
+__attribute__((nonnull, always_inline)) static __inline void
 gcq_init(struct gcq *q)
 {
        q->q_next = q->q_prev = q;
 }
 
 __attribute__((nonnull, const, warn_unused_result, always_inline)) 
-static inline struct gcq *
+static __inline struct gcq *
 gcq_q(struct gcq *q)
 {
        return q;
 }
 
 __attribute__((nonnull, const, warn_unused_result, always_inline)) 
-static inline struct gcq *
+static __inline struct gcq *
 gcq_hq(struct gcq_head *head)
 {
        return (struct gcq *)head;
 }
 
 __attribute__((nonnull, const, warn_unused_result, always_inline)) 
-static inline struct gcq_head *
+static __inline struct gcq_head *
 gcq_head(struct gcq *q)
 {
        return (struct gcq_head *)q;
 }
 
-__attribute__((nonnull, always_inline)) static inline void
+__attribute__((nonnull, always_inline)) static __inline void
 gcq_init_head(struct gcq_head *head)
 {
        gcq_init(gcq_hq(head));
 }
 
 __attribute__((nonnull, pure, warn_unused_result, always_inline))
-static inline bool
+static __inline bool
 gcq_onlist(struct gcq *q)
 {
        return (q->q_next != q);
 }
 
 __attribute__((nonnull, pure, warn_unused_result, always_inline))
-static inline bool
+static __inline bool
 gcq_empty(struct gcq_head *head)
 {
        return (!gcq_onlist(gcq_hq(head)));
 }
 
 __attribute__((nonnull, pure, warn_unused_result, always_inline))
-static inline bool
+static __inline bool
 gcq_linked(struct gcq *prev, struct gcq *next)
 {
        return (prev->q_next == next && next->q_prev == prev);
 }
 
-__attribute__((nonnull, always_inline)) static inline void
+__attribute__((nonnull, always_inline)) static __inline void
 gcq_insert_after(struct gcq *on, struct gcq *off)
 {
        struct gcq *on_next;
@@ -117,7 +117,7 @@
        on->q_next = off;
 }
 
-__attribute__((nonnull)) static inline void
+__attribute__((nonnull)) static __inline void
 gcq_insert_before(struct gcq *on, struct gcq *off)
 {
        struct gcq *on_prev;
@@ -130,19 +130,19 @@
        on->q_prev = off;
 }



Home | Main Index | Thread Index | Old Index