btrfs-progs: compilation errors when using musl libc

- limits.h must be included to pick up PATH_MAX.
- remove double declaration of BTRFS_DISABLE_BACKTRACE

kerncompat.h assumed that if __GLIBC__ was not defined,
it could safely define BTRFS_DISABLE_BACKTRACE, however this can be
defined by the configure script. Added a check to ensure it is not
defined first.

Signed-off-by: Brendan Heading <brendanheading@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/cmds-inspect.c b/cmds-inspect.c
index 56da09f..fc3db99 100644 (file)
--- a/cmds-inspect.c
+++ b/cmds-inspect.c
@@ -21,6 +21,7 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <getopt.h>
+#include <limits.h>
 
 #include "kerncompat.h"
 #include "ioctl.h"

diff --git a/cmds-receive.c b/cmds-receive.c
index 071bea9..d4b3103 100644 (file)
--- a/cmds-receive.c
+++ b/cmds-receive.c
@@ -28,6 +28,7 @@
 #include <wait.h>
 #include <assert.h>
 #include <getopt.h>
+#include <limits.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>

diff --git a/cmds-scrub.c b/cmds-scrub.c
index b7aa809..5a85dc4 100644 (file)
--- a/cmds-scrub.c
+++ b/cmds-scrub.c
@@ -34,6 +34,7 @@
 #include <ctype.h>
 #include <signal.h>
 #include <stdarg.h>
+#include <limits.h>
 
 #include "ctree.h"
 #include "ioctl.h"

diff --git a/cmds-send.c b/cmds-send.c
index 20bba18..a0b7f95 100644 (file)
--- a/cmds-send.c
+++ b/cmds-send.c
@@ -33,6 +33,7 @@
 #include <assert.h>
 #include <getopt.h>
 #include <uuid/uuid.h>
+#include <limits.h>
 
 #include "ctree.h"
 #include "ioctl.h"

diff --git a/kerncompat.h b/kerncompat.h
index 5d92856..7c627ba 100644 (file)
--- a/kerncompat.h
+++ b/kerncompat.h
@@ -33,7 +33,9 @@
 #include <features.h>
 
 #ifndef __GLIBC__
+#ifndef BTRFS_DISABLE_BACKTRACE
 #define BTRFS_DISABLE_BACKTRACE
+#endif
 #define __always_inline __inline __attribute__ ((__always_inline__))
 #endif