[PATCH vkd3d v2] vkd3d: Properly check for program_invocation_name.

[Henri Verbeet]

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
This supersedes patch 173750.

 configure.ac       | 2 ++
 libs/vkd3d/utils.c | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 819e768..355aaab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,8 @@ AC_CHECK_DECL([SpvCapabilityDemoteToHelperInvocationEXT],, [AC_MSG_ERROR([SPIR-V
 # include "vulkan/spirv.h"
 #endif])
 
+AC_CHECK_DECLS([program_invocation_name],,,[#include <errno.h>])
+
 dnl Check for libraries
 m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])])
 
diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c
index 1fc0e9d..cf0448d 100644
--- a/libs/vkd3d/utils.c
+++ b/libs/vkd3d/utils.c
@@ -828,7 +828,7 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs,
     return S_OK;
 }
 
-#ifdef _GNU_SOURCE
+#if HAVE_DECL_PROGRAM_INVOCATION_NAME
 
 bool vkd3d_get_program_name(char program_name[PATH_MAX])
 {
@@ -870,7 +870,7 @@ bool vkd3d_get_program_name(char program_name[PATH_MAX])
     return false;
 }
 
-#endif  /* _GNU_SOURCE */
+#endif  /* HAVE_DECL_PROGRAM_INVOCATION_NAME */
 
 static struct vkd3d_private_data *vkd3d_private_store_get_private_data(
         const struct vkd3d_private_store *store, const GUID *tag)
-- 
2.11.0

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=60228

Your paranoid android.


=== debian10 (build log) ===

error: patch failed: configure.ac:78
Task: Patch failed to apply

=== debian10 (build log) ===

error: patch failed: configure.ac:78
Task: Patch failed to apply