From ae3c8c20850cc03ad0aaae803fd39d9dceeb78a6 Mon Sep 17 00:00:00 2001 From: samuel Date: Tue, 20 Nov 2018 10:17:17 +0000 Subject: Prefer "static inline" to avoid duplicate symbols. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65861 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- coroutine/amd64/Context.h | 4 ++-- coroutine/arm32/Context.h | 4 ++-- coroutine/arm64/Context.h | 4 ++-- coroutine/win32/Context.h | 4 ++-- coroutine/win64/Context.h | 4 ++-- coroutine/x86/Context.h | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/coroutine/amd64/Context.h b/coroutine/amd64/Context.h index f6efd6d1b5..87accda5c3 100644 --- a/coroutine/amd64/Context.h +++ b/coroutine/amd64/Context.h @@ -25,7 +25,7 @@ typedef struct typedef COROUTINE(* coroutine_start)(coroutine_context *from, coroutine_context *self); -inline void coroutine_initialize( +static inline void coroutine_initialize( coroutine_context *context, coroutine_start start, void *stack_pointer, @@ -49,7 +49,7 @@ inline void coroutine_initialize( coroutine_context * coroutine_transfer(coroutine_context * current, coroutine_context * target); -inline void coroutine_destroy(coroutine_context * context) +static inline void coroutine_destroy(coroutine_context * context) { context->stack_pointer = NULL; } diff --git a/coroutine/arm32/Context.h b/coroutine/arm32/Context.h index 1af67a9065..4cf5ad38b6 100644 --- a/coroutine/arm32/Context.h +++ b/coroutine/arm32/Context.h @@ -25,7 +25,7 @@ typedef struct typedef COROUTINE(* coroutine_start)(coroutine_context *from, coroutine_context *self); -inline void coroutine_initialize( +static inline void coroutine_initialize( coroutine_context *context, coroutine_start start, void *stack_pointer, @@ -47,7 +47,7 @@ inline void coroutine_initialize( coroutine_context * coroutine_transfer(coroutine_context * current, coroutine_context * target); -inline void coroutine_destroy(coroutine_context * context) +static inline void coroutine_destroy(coroutine_context * context) { } diff --git a/coroutine/arm64/Context.h b/coroutine/arm64/Context.h index 0d48db2abe..da509c76b4 100644 --- a/coroutine/arm64/Context.h +++ b/coroutine/arm64/Context.h @@ -25,7 +25,7 @@ typedef struct typedef COROUTINE(* coroutine_start)(coroutine_context *from, coroutine_context *self); -inline void coroutine_initialize( +static inline void coroutine_initialize( coroutine_context *context, coroutine_start start, void *stack_pointer, @@ -48,7 +48,7 @@ inline void coroutine_initialize( coroutine_context * coroutine_transfer(coroutine_context * current, coroutine_context * target); -inline void coroutine_destroy(coroutine_context * context) +static inline void coroutine_destroy(coroutine_context * context) { } diff --git a/coroutine/win32/Context.h b/coroutine/win32/Context.h index cea0345db1..8dd47696c5 100644 --- a/coroutine/win32/Context.h +++ b/coroutine/win32/Context.h @@ -25,7 +25,7 @@ struct coroutine_context typedef COROUTINE(* coroutine_start)(coroutine_context *from, coroutine_context *self); -inline void coroutine_initialize( +static inline void coroutine_initialize( coroutine_context *context, coroutine_start start, void *stack_pointer, @@ -52,7 +52,7 @@ inline void coroutine_initialize( coroutine_context * __fastcall coroutine_transfer(coroutine_context * current, coroutine_context * target); -inline void coroutine_destroy(coroutine_context * context) +static inline void coroutine_destroy(coroutine_context * context) { } diff --git a/coroutine/win64/Context.h b/coroutine/win64/Context.h index ec2c0e8566..3b6ffb2175 100644 --- a/coroutine/win64/Context.h +++ b/coroutine/win64/Context.h @@ -25,7 +25,7 @@ struct coroutine_context typedef COROUTINE(* coroutine_start)(coroutine_context *from, coroutine_context *self); -inline void coroutine_initialize( +static inline void coroutine_initialize( coroutine_context *context, coroutine_start start, void *stack_pointer, @@ -52,7 +52,7 @@ inline void coroutine_initialize( coroutine_context * coroutine_transfer(coroutine_context * current, coroutine_context * target); -inline void coroutine_destroy(coroutine_context * context) +static inline void coroutine_destroy(coroutine_context * context) { } diff --git a/coroutine/x86/Context.h b/coroutine/x86/Context.h index 8a65800891..82bb6dd6c3 100644 --- a/coroutine/x86/Context.h +++ b/coroutine/x86/Context.h @@ -25,11 +25,11 @@ typedef struct typedef COROUTINE(* coroutine_start)(coroutine_context *from, coroutine_context *self) __attribute__((fastcall)); -void coroutine_initialize( - coroutine_context *context, - coroutine_start start, - void *stack_pointer, - size_t stack_size +static inline void coroutine_initialize( + coroutine_context *context, + coroutine_start start, + void *stack_pointer, + size_t stack_size ) { /* Force 16-byte alignment */ context->stack_pointer = (void**)((uintptr_t)stack_pointer & ~0xF); @@ -49,7 +49,7 @@ void coroutine_initialize( coroutine_context * coroutine_transfer(coroutine_context * current, coroutine_context * target) __attribute__((fastcall)); -inline void coroutine_destroy(coroutine_context * context) +static inline void coroutine_destroy(coroutine_context * context) { context->stack_pointer = NULL; } -- cgit v1.2.3