diff options
| -rw-r--r-- | pixman/pixman-compiler.h | 11 | ||||
| -rw-r--r-- | test/gtk-utils.c | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h index 1a1350dd..f0f9d91f 100644 --- a/pixman/pixman-compiler.h +++ b/pixman/pixman-compiler.h @@ -70,7 +70,14 @@ #endif /* TLS */ -#if defined(TOOLCHAIN_SUPPORTS__THREAD) +#if defined(PIXMAN_NO_TLS) + +# define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \ + static type name +# define PIXMAN_GET_THREAD_LOCAL(name) \ + (&name) + +#elif defined(TOOLCHAIN_SUPPORTS__THREAD) # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \ static __thread type name @@ -191,6 +198,6 @@ extern __stdcall int ReleaseMutex (void *); #else -# error "Unknown thread local support for this system" +# error "Unknown thread local support for this system. Pixman will not work with multiple threads. Define PIXMAN_NO_TLS to acknowledge and accept this limitation and compile pixman without thread-safety support." #endif diff --git a/test/gtk-utils.c b/test/gtk-utils.c index 751a164c..0e7cb5cb 100644 --- a/test/gtk-utils.c +++ b/test/gtk-utils.c @@ -92,6 +92,8 @@ show_image (pixman_image_t *image) height = pixman_image_get_height (image); stride = pixman_image_get_stride (image); + gtk_window_set_default_size (GTK_WINDOW (window), width, height); + format = image->bits.format; if (format == PIXMAN_a8r8g8b8) |