hurd-hacks

Gbp-Pq: Name hurd-hacks.diff

diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
index d18fd3c89afcf8e5d462763fd0d57f1f1d86e144..7abb96c63eee4b1ff716107abeb556972e3a13ec 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 560880f22ef1738aceb365e9f7fcf7f13b409301..00d1c46f6d9e99fb396c3d795a04784dd6d1cd03 100644 (file)
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -53,7 +53,6 @@ extern "C" {
 #include "debuginfod.h"
 #include <dwarf.h>
 
-#include <argp.h>
 #ifdef __GNUC__
 #undef __attribute__ /* glibc bug - rhbz 1763325 */
 #endif
@@ -132,6 +131,8 @@ using namespace std;
 #define tid() pthread_self()
 #endif
 
+#include <argp.h>
+
 extern "C" {
 #include "printversion.h"
 #include "system.h"
@@ -695,10 +696,10 @@ parse_opt (int key, char *arg,
         argp_failure(state, 1, EINVAL, "scan checkpoint");        
       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 555553012ff9322b701b03c7d2421612658e116a..ed8f789b568d02418f7ddf75be40b86ef24220ae 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