1 From c43546d2c9d877df6963a18f93377f93a169d43a Mon Sep 17 00:00:00 2001
2 From: Cyril Brulebois <kibi@debian.org>
3 Date: Sun, 13 Feb 2011 06:58:45 +0000
4 Subject: [PATCH] Fix FTBFS on GNU/Hurd due to missing PIPE_OS_HURD detection.
6 Thanks to Pino Toscano.
8 Signed-off-by: Cyril Brulebois <kibi@debian.org>
10 src/gallium/auxiliary/os/os_thread.h | 12 ++++++------
11 src/gallium/auxiliary/os/os_time.c | 2 +-
12 2 files changed, 7 insertions(+), 7 deletions(-)
14 --- a/src/gallium/auxiliary/os/os_thread.h
15 +++ b/src/gallium/auxiliary/os/os_thread.h
17 #include "util/u_debug.h" /* for assert */
20 -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
21 +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
23 #include <pthread.h> /* POSIX threads headers */
24 #include <stdio.h> /* for perror() */
25 @@ -314,7 +314,7 @@ typedef int64_t pipe_condvar;
29 -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HAIKU)
30 +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_HURD)
32 typedef pthread_barrier_t pipe_barrier;
34 @@ -442,7 +442,7 @@ pipe_semaphore_wait(pipe_semaphore *sema
38 -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
39 +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
41 #elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
43 @@ -457,7 +457,7 @@ typedef struct {
45 pipe_tsd_init(pipe_tsd *tsd)
47 -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
48 +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
49 if (pthread_key_create(&tsd->key, NULL/*free*/) != 0) {
50 perror("pthread_key_create(): failed to allocate key for thread specific data");
52 @@ -474,7 +474,7 @@ pipe_tsd_get(pipe_tsd *tsd)
53 if (tsd->initMagic != (int) PIPE_TSD_INIT_MAGIC) {
56 -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
57 +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
58 return pthread_getspecific(tsd->key);
59 #elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
61 @@ -491,7 +491,7 @@ pipe_tsd_set(pipe_tsd *tsd, void *value)
62 if (tsd->initMagic != (int) PIPE_TSD_INIT_MAGIC) {
65 -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
66 +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
67 if (pthread_setspecific(tsd->key, value) != 0) {
68 perror("pthread_set_specific() failed");