Remove rpm compat define from header files.

diff --git a/zypp/target/rpm/BinHeader.cc b/zypp/target/rpm/BinHeader.cc
index 5485da861916a5b7cc6befe0b01c65ab07f9faf5..73dc74830cf7506695feaa6f73e4c00709f104ed 100644 (file)
--- 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 e80dafd80b6e649b3117358a458bc6fc0b9b152c..430f77e8371fabb02b8212c65dac315bdc0f1f70 100644 (file)
--- a/zypp/target/rpm/librpm.h
+++ b/zypp/target/rpm/librpm.h
@@ -19,10 +19,6 @@ extern "C"
 #include <rpm/rpmdb.h>
 #include <rpm/rpmts.h>
 #include <fcntl.h>
-
-#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 65c1c41bd2540c4cf5275e75356a374d274932c1..cc353ff98c2211570e6687246278905875687a1c 100644 (file)
--- 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>