[Mesa-dev] [PATCH 1/2] gallium: fix build on GNU/Hurd due to missing PIPE_OS_HURD detection

[Brian Paul]

On 11/12/2013 02:51 AM, Fabio Pedretti wrote:
> From: Cyril Brulebois <kibi at debian.org>
>
> Thanks to Pino Toscano.
>
> Patch from Debian package.
>
> Cc: "10.0" <mesa-stable at lists.freedesktop.org>
> ---
>   src/gallium/auxiliary/os/os_thread.h | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h
> index e153ab4..4528abb 100644
> --- a/src/gallium/auxiliary/os/os_thread.h
> +++ b/src/gallium/auxiliary/os/os_thread.h
> @@ -41,7 +41,7 @@
>   #include "util/u_debug.h" /* for assert */
>
>
> -#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)
> +#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)
>
>   #include <pthread.h> /* POSIX threads headers */
>   #include <stdio.h> /* for perror() */
> @@ -316,7 +316,7 @@ typedef int64_t pipe_condvar;
>    * pipe_barrier
>    */
>
> -#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)) && !defined(PIPE_OS_ANDROID)
> +#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HURD)) && !defined(PIPE_OS_ANDROID)
>
>   typedef pthread_barrier_t pipe_barrier;
>
> @@ -444,7 +444,7 @@ pipe_semaphore_wait(pipe_semaphore *sema)
>    */
>
>   typedef struct {
> -#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)
> +#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)
>      pthread_key_t key;
>   #elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
>      DWORD key;
> @@ -459,7 +459,7 @@ typedef struct {
>   static INLINE void
>   pipe_tsd_init(pipe_tsd *tsd)
>   {
> -#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)
> +#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)
>      if (pthread_key_create(&tsd->key, NULL/*free*/) != 0) {
>         perror("pthread_key_create(): failed to allocate key for thread specific data");
>         exit(-1);
> @@ -476,7 +476,7 @@ pipe_tsd_get(pipe_tsd *tsd)
>      if (tsd->initMagic != (int) PIPE_TSD_INIT_MAGIC) {
>         pipe_tsd_init(tsd);
>      }
> -#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)
> +#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)
>      return pthread_getspecific(tsd->key);
>   #elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
>      assert(0);
> @@ -493,7 +493,7 @@ pipe_tsd_set(pipe_tsd *tsd, void *value)
>      if (tsd->initMagic != (int) PIPE_TSD_INIT_MAGIC) {
>         pipe_tsd_init(tsd);
>      }
> -#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)
> +#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)
>      if (pthread_setspecific(tsd->key, value) != 0) {
>         perror("pthread_set_specific() failed");
>         exit(-1);
>

Looks OK to me.  Do you need someone to commit this for you?

-Brian