From 6a38401c78a02b9bd14e50966ecdd54a003597b7 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Mon, 10 Aug 2009 13:01:30 -0700
Subject: Simplify _ELFUTILS_PREREQ checking

We were jumping through a few hoops to deal with elfutils < 0.138 that
did not have the _ELFUTILS_PREREQ macro.  I've added an always-false
dummy macro to take its place when it doesn't exit.  All of the other
"#ifdef _ELFUTILS_PREREQ" ugliness can now go away.
---
 dwflpp.h | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'dwflpp.h')

diff --git a/dwflpp.h b/dwflpp.h
index f6305bcf..b376d004 100644
--- a/dwflpp.h
+++ b/dwflpp.h
@@ -25,19 +25,14 @@
 
 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>
 }
 
+#if !_ELFUTILS_PREREQ(0,142)
+// Always use newer name, old name is deprecated in 0.142.
+#define elf_getshdrstrndx elf_getshstrndx
+#endif
+
 
 struct func_info;
 struct inline_instance_info;
-- 
cgit