diff options
| -rw-r--r-- | cmd/ztest/ztest.c | 4 | ||||
| -rw-r--r-- | tests/zfs-tests/cmd/xattrtest/xattrtest.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index ab20a635d..d2bf01019 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -133,7 +133,7 @@ #include <libnvpair.h> #include <libzutil.h> #include <sys/crypto/icp.h> -#ifdef __GLIBC__ +#if (__GLIBC__ && !__UCLIBC__) #include <execinfo.h> /* for backtrace() */ #endif @@ -563,7 +563,7 @@ dump_debug_buffer(void) static void sig_handler(int signo) { struct sigaction action; -#ifdef __GLIBC__ /* backtrace() is a GNU extension */ +#if (__GLIBC__ && !__UCLIBC__) /* backtrace() is a GNU extension */ int nptrs; void *buffer[BACKTRACE_SZ]; diff --git a/tests/zfs-tests/cmd/xattrtest/xattrtest.c b/tests/zfs-tests/cmd/xattrtest/xattrtest.c index 42c510ed0..8c4cb8895 100644 --- a/tests/zfs-tests/cmd/xattrtest/xattrtest.c +++ b/tests/zfs-tests/cmd/xattrtest/xattrtest.c @@ -44,11 +44,9 @@ #include <sys/time.h> #include <linux/limits.h> -extern char *program_invocation_short_name; - #define ERROR(fmt, ...) \ - fprintf(stderr, "%s: %s:%d: %s: " fmt "\n", \ - program_invocation_short_name, __FILE__, __LINE__, \ + fprintf(stderr, "xattrtest: %s:%d: %s: " fmt "\n", \ + __FILE__, __LINE__, \ __func__, ## __VA_ARGS__); static const char shortopts[] = "hvycdn:f:x:s:p:t:e:rRko:"; |