From 7149bffe669a5067bc332d017e8a501474333a7f Mon Sep 17 00:00:00 2001
From: Marek Olšák <marek.olsak@amd.com>
Date: Tue, 3 Jul 2018 14:16:17 -0400
Subject: gallium/os: use util_get_process_name when possible

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
---
 src/gallium/auxiliary/os/os_process.c | 16 ++--------------
 src/util/process.c                    |  2 ++
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/gallium/auxiliary/os/os_process.c b/src/gallium/auxiliary/os/os_process.c
index 035bd228e76..87072f0b046 100644
--- a/src/gallium/auxiliary/os/os_process.c
+++ b/src/gallium/auxiliary/os/os_process.c
@@ -29,18 +29,13 @@
 #include "pipe/p_config.h"
 #include "os/os_process.h"
 #include "util/u_memory.h"
+#include "util/process.h"
 
 #if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
 #  include <windows.h>
-#elif defined(__GLIBC__) || defined(__CYGWIN__)
-#  include <errno.h>
-#elif defined(PIPE_OS_BSD) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_ANDROID)
-#  include <stdlib.h>
 #elif defined(PIPE_OS_HAIKU)
 #  include <kernel/OS.h>
 #  include <kernel/image.h>
-#else
-#warning unexpected platform in os_process.c
 #endif
 
 #if defined(PIPE_OS_LINUX)
@@ -84,20 +79,13 @@ os_get_process_name(char *procname, size_t size)
 
       name = lpProcessName;
 
-#elif defined(__GLIBC__) || defined(__CYGWIN__)
-      name = program_invocation_short_name;
-#elif defined(PIPE_OS_BSD) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_ANDROID)
-      /* *BSD and OS X */
-      name = getprogname();
 #elif defined(PIPE_OS_HAIKU)
       image_info info;
       get_image_info(B_CURRENT_TEAM, &info);
       name = info.name;
 #else
-#warning unexpected platform in os_process.c
-      return FALSE;
+      name = util_get_process_name();
 #endif
-
    }
 
    assert(size > 0);
diff --git a/src/util/process.c b/src/util/process.c
index 992ba7f734a..449c7fa77c2 100644
--- a/src/util/process.c
+++ b/src/util/process.c
@@ -60,6 +60,8 @@ __getProgramName()
 #    define GET_PROGRAM_NAME() getprogname()
 #elif defined(__APPLE__)
 #    define GET_PROGRAM_NAME() getprogname()
+#elif defined(ANDROID)
+#    define GET_PROGRAM_NAME() getprogname()
 #elif defined(__sun)
 /* Solaris has getexecname() which returns the full path - return just
    the basename to match BSD getprogname() */
-- 
cgit v1.2.3