From 1cb643a1eda1f7cb3a04bc49a5152eb2f69c0bde Mon Sep 17 00:00:00 2001
From: Debian Elfutils Maintainers <debian-gcc@lists.debian.org>
Date: Tue, 22 Oct 2024 13:13:50 +0200
Subject: [PATCH] hurd-hacks

Gbp-Pq: Name hurd-hacks.diff
---
 debuginfod/debuginfod-client.c | 4 ++++
 debuginfod/debuginfod.cxx      | 7 ++++---
 tests/backtrace.c              | 4 ++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
index 0c2b43e..d859070 100644
--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
@@ -58,6 +58,10 @@
 typedef enum {ignore, enforcing, undefined} ima_policy_t;
 
 
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+
 /* We might be building a bootstrap dummy library, which is really simple. */
 #ifdef DUMMY_LIBDEBUGINFOD
 
diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
index 4bb517b..5d7aca2 100644
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -58,7 +58,6 @@ extern "C" {
 #include "debuginfod.h"
 #include <dwarf.h>
 
-#include <argp.h>
 #ifdef __GNUC__
 #undef __attribute__ /* glibc bug - rhbz 1763325 */
 #endif
@@ -149,6 +148,8 @@ using namespace std;
 #define tid() pthread_self()
 #endif
 
+#include <argp.h>
+
 extern "C" {
 #include "printversion.h"
 #include "system.h"
@@ -748,10 +749,10 @@ parse_opt (int key, char *arg,
       break;
 #endif
       // case 'h': argp_state_help (state, stderr, ARGP_HELP_LONG|ARGP_HELP_EXIT_OK);
-    default: return ARGP_ERR_UNKNOWN;
+    default: return (error_t) ARGP_ERR_UNKNOWN;
     }
 
-  return 0;
+  return (error_t)0;
 }
 
 
diff --git a/tests/backtrace.c b/tests/backtrace.c
index 5555530..ed8f789 100644
--- a/tests/backtrace.c
+++ b/tests/backtrace.c
@@ -40,6 +40,10 @@
 #endif
 #include "system.h"
 
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+
 #ifndef __linux__
 
 int
-- 
2.30.2