Merge branch 'master' of git://sources.redhat.com/git/systemtap

1 files changed, 10 insertions, 0 deletions

diff --git a/dwflpp.h b/dwflpp.h
index 9cd2cb59..ec2fc2b9 100644
--- a/dwflpp.h
+++ b/dwflpp.h
@@ -25,6 +25,16 @@
 
 extern "C" {
 #include <elfutils/libdwfl.h>
+#ifdef HAVE_ELFUTILS_VERSION_H
+  #include <elfutils/version.h>
+  #if !_ELFUTILS_PREREQ(0,142)
+    // Always use newer name, old name is deprecated in 0.142.
+    #define elf_getshdrstrndx elf_getshstrndx
+  #endif
+#else
+  // Really old elfutils version, definitely redefine to use old name.
+  #define elf_getshdrstrndx elf_getshstrndx
+#endif
 #include <regex.h>
 }