ref: refs/heads/SuSE-Code-11-Branch commit f0951b44ce3ef0494105a27c8338330b5500c57b Author: Michael Andres Date: Wed May 6 12:14:18 2009 +0200 Remove rpm compat define from header files. --- zypp/target/rpm/BinHeader.cc | 6 ++++++ zypp/target/rpm/librpm.h | 4 ---- zypp/target/rpm/librpmDb.cv3.cc | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/zypp/target/rpm/BinHeader.cc b/zypp/target/rpm/BinHeader.cc index 5485da8..73dc748 100644 --- a/zypp/target/rpm/BinHeader.cc +++ b/zypp/target/rpm/BinHeader.cc @@ -10,6 +10,12 @@ * */ #include "librpm.h" +extern "C" +{ +#ifndef _RPM_4_4_COMPAT +typedef int32_t rpm_count_t; +#endif +} #include <iostream> diff --git a/zypp/target/rpm/librpm.h b/zypp/target/rpm/librpm.h index e80dafd..430f77e 100644 --- a/zypp/target/rpm/librpm.h +++ b/zypp/target/rpm/librpm.h @@ -19,10 +19,6 @@ extern "C" #include #include #include - -#ifndef _RPM_4_4_COMPAT -typedef int32_t rpm_count_t; -#endif } #endif // ZYPP_TARGET_RPM_LIBRPM_H diff --git a/zypp/target/rpm/librpmDb.cv3.cc b/zypp/target/rpm/librpmDb.cv3.cc index 65c1c41..cc353ff 100644 --- a/zypp/target/rpm/librpmDb.cv3.cc +++ b/zypp/target/rpm/librpmDb.cv3.cc @@ -11,6 +11,12 @@ */ #include "librpm.h" +extern "C" +{ +#ifndef _RPM_4_4_COMPAT +typedef int32_t rpm_count_t; +#endif +} #include <iostream> -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org