diff options
| author | Michael Forney <mforney@mforney.org> | 2019-11-17 16:48:01 -0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2020-04-26 13:46:43 -0700 |
| commit | 3b1fefda7f073491aacad93b4197fbfd0383c77f (patch) | |
| tree | 29d8e36c9b666abf3ffd4eaee0ec57e213e25e2f | |
| parent | 10a057e27f3a256c3b3ffc4fa71c45b0bbb783f7 (diff) | |
| download | pixman-3b1fefda7f073491aacad93b4197fbfd0383c77f.tar.gz | |
Prevent empty top-level declaration
The expansion of PIXMAN_DEFINE_THREAD_LOCAL(...) may end in a
function definition, so the following semicolon is considered an
empty top-level declaration, which is not allowed in ISO C.
Reviewed-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | pixman/pixman-compiler.h | 6 | ||||
| -rw-r--r-- | pixman/pixman-implementation.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h index a02aa49..6394156 100644 --- a/pixman/pixman-compiler.h +++ b/pixman/pixman-compiler.h @@ -109,14 +109,14 @@ #if defined(PIXMAN_NO_TLS) # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \ - static type name + static type name; # define PIXMAN_GET_THREAD_LOCAL(name) \ (&name) #elif defined(TLS) # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \ - static TLS type name + static TLS type name; # define PIXMAN_GET_THREAD_LOCAL(name) \ (&name) @@ -176,7 +176,7 @@ #elif defined(_MSC_VER) # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \ - static __declspec(thread) type name + static __declspec(thread) type name; # define PIXMAN_GET_THREAD_LOCAL(name) \ (&name) diff --git a/pixman/pixman-implementation.c b/pixman/pixman-implementation.c index 2c7de4c..5a2cbfe 100644 --- a/pixman/pixman-implementation.c +++ b/pixman/pixman-implementation.c @@ -63,7 +63,7 @@ typedef struct } cache [N_CACHED_FAST_PATHS]; } cache_t; -PIXMAN_DEFINE_THREAD_LOCAL (cache_t, fast_path_cache); +PIXMAN_DEFINE_THREAD_LOCAL (cache_t, fast_path_cache) static void dummy_composite_rect (pixman_implementation_t *imp, |