hurd-hacks

===================================================================

Gbp-Pq: Name hurd-hacks.diff

diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
index 180b4da891450c6ed8398abc2330073e67357c5d..c87e09c80d5a48b3aad251c51cd75e1add366adf 100644 (file)
--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
@@ -47,6 +47,10 @@
 #include <stdlib.h>
 #include <gelf.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 99b1f2b9eee45fb16d4d3b45432f0331938c3387..3f9ecb10fe859ee4828e35800f701275187606df 100644 (file)
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -44,6 +44,8 @@ extern "C" {
 }
 #endif
 
+#include <argp.h>
+
 extern "C" {
 #include "printversion.h"
 #include "system.h"
@@ -52,7 +54,6 @@ extern "C" {
 #include "debuginfod.h"
 #include <dwarf.h>
 
-#include <argp.h>
 #ifdef __GNUC__
 #undef __attribute__ /* glibc bug - rhbz 1763325 */
 #endif
@@ -654,10 +655,10 @@ parse_opt (int key, char *arg,
       scan_source_info = false;
       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 afc12fb939a1c24e876b731b4937656eecdb4107..2df9c62bbaf9e422c5510ddda1cecc0988a67274 100644 (file)
--- 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