From 32637f56a5422b09ad945d21d8e60a8b990b0182 Mon Sep 17 00:00:00 2001 From: Andreas Boll Date: Wed, 11 Sep 2013 14:27:08 +0200 Subject: [PATCH] os: First check for __GLIBC__ and then for PIPE_OS_BSD 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" Tested-by: Julien Cristau Reviewed-by: Brian Paul --- 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 05576893227..ef38e1d689f 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 -#elif defined(PIPE_OS_BSD) || defined(PIPE_OS_APPLE) -# include #elif defined(__GLIBC__) # include +#elif defined(PIPE_OS_BSD) || defined(PIPE_OS_APPLE) +# include #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; -- 2.30.2