[Mesa-stable] [Mesa-dev] [PATCH] os: First check for __GLIBC__ and then for PIPE_OS_BSD

[Brian Paul]

On 09/11/2013 07:02 AM, Andreas Boll wrote:
> Fixes FTBFS on kfreebsd-*
>
> Debian GNU/kFreeBSD doesn't provide getprogname() since it uses stdlib.h
> from glibc. Instead it provides program_invocation_short_name from glibc.
>
> You can find the same order in src/mesa/drivers/dri/common/xmlconfig.c
>
> Cc: "9.2" <mesa-stable at lists.freedesktop.org>
> Tested-by: Julien Cristau <jcristau at debian.org>
> ---
>   src/gallium/auxiliary/os/os_process.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/gallium/auxiliary/os/os_process.c b/src/gallium/auxiliary/os/os_process.c
> index 0557689..ef38e1d 100644
> --- a/src/gallium/auxiliary/os/os_process.c
> +++ b/src/gallium/auxiliary/os/os_process.c
> @@ -32,10 +32,10 @@
>
>   #if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
>   #  include <windows.h>
> -#elif defined(PIPE_OS_BSD) || defined(PIPE_OS_APPLE)
> -#  include <stdlib.h>
>   #elif defined(__GLIBC__)
>   #  include <errno.h>
> +#elif defined(PIPE_OS_BSD) || defined(PIPE_OS_APPLE)
> +#  include <stdlib.h>
>   #else
>   #warning unexpected platform in os_process.c
>   #endif
> @@ -68,11 +68,11 @@ os_get_process_name(char *procname, size_t size)
>
>      name = lpProcessName;
>
> +#elif defined(__GLIBC__)
> +   name = program_invocation_short_name;
>   #elif defined(PIPE_OS_BSD) || defined(PIPE_OS_APPLE)
>      /* *BSD and OS X */
>      name = getprogname();
> -#elif defined(__GLIBC__)
> -   name = program_invocation_short_name;
>   #else
>   #warning unexpected platform in os_process.c
>      return FALSE;
>

Reviewed-by: Brian Paul <brianp at vmware.com>