diff options
author | Josh Stone <jistone@redhat.com> | 2009-08-10 13:01:30 -0700 |
---|---|---|
committer | Josh Stone <jistone@redhat.com> | 2009-08-10 13:01:30 -0700 |
commit | 6a38401c78a02b9bd14e50966ecdd54a003597b7 (patch) | |
tree | 756865ad341d322f3e47bae5d398ebb23ba48209 /dwflpp.h | |
parent | 23d106b9c554c2b32dfb8c94dc963834f65ef7df (diff) | |
download | systemtap-steved-6a38401c78a02b9bd14e50966ecdd54a003597b7.tar.gz systemtap-steved-6a38401c78a02b9bd14e50966ecdd54a003597b7.tar.xz systemtap-steved-6a38401c78a02b9bd14e50966ecdd54a003597b7.zip |
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.
Diffstat (limited to 'dwflpp.h')
-rw-r--r-- | dwflpp.h | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -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; |