src/ports/SkMutex_pthread.h - Issue 419113002: Fix thread unsafe mutex initialization.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/ports/SkMutex_pthread.h

Issue 419113002: Fix thread unsafe mutex initialization. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: gcc also wants impls to be inline or used. Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/ports/SkMutex_pthread.h

diff --git a/src/ports/SkMutex_pthread.h b/src/ports/SkMutex_pthread.h

index f71016b31e88a28b3cc1932a2e4bf1d0f0c93abd..e5bf5fc3b15c5050c100a72f5d6249e2ab3bfb28 100644

--- a/src/ports/SkMutex_pthread.h

+++ b/src/ports/SkMutex_pthread.h

@@ -89,9 +89,6 @@ private:

#define SK_BASE_MUTEX_INIT { PTHREAD_MUTEX_INITIALIZER, SkDEBUGCODE(0) }

// Using POD-style initialization prevents the generation of a static initializer.

-#define SK_DECLARE_STATIC_MUTEX(name) static SkBaseMutex name = SK_BASE_MUTEX_INIT

-// Special case used when the static mutex must be available globally.

-#define SK_DECLARE_GLOBAL_MUTEX(name) SkBaseMutex name = SK_BASE_MUTEX_INIT

+#define SK_DECLARE_STATIC_MUTEX(name) static inline void SK_MACRO_APPEND_LINE(name)(){} static SkBaseMutex name = SK_BASE_MUTEX_INIT

#endif