From: Debian Elfutils Maintainers <debian-gcc@lists.debian.org>
Date: Fri, 9 Sep 2022 17:53:50 +0000 (+0100)
Subject: hurd-hacks
X-Git-Tag: archive/raspbian/0.188-2.1+rpi1~1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=05507a4b9ab5a40a6c97d7ccdd782b0625696c2f;p=elfutils.git

hurd-hacks


Gbp-Pq: Name hurd-hacks.diff
---

diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
index 91783ed..f53a415 100644
--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
@@ -45,6 +45,10 @@
 #include <errno.h>
 #include <stdlib.h>
 
+#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 4aaf41c..7aaffd1 100644
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -32,6 +32,8 @@
   #include "config.h"
 #endif
 
+#include <argp.h>
+
 extern "C" {
 #include "printversion.h"
 #include "system.h"
@@ -40,7 +42,6 @@ extern "C" {
 #include "debuginfod.h"
 #include <dwarf.h>
 
-#include <argp.h>
 #ifdef __GNUC__
 #undef __attribute__ /* glibc bug - rhbz 1763325 */
 #endif
@@ -633,10 +634,10 @@ parse_opt (int key, char *arg,
         argp_failure(state, 1, EINVAL, "inconsistent options with passive mode");
       break;
       // 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 afc12fb..2df9c62 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