X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=zypp%2Fsat%2Fdetail%2FPoolMember.h;h=6819e51df4a1cd54f4105c619d392520065c88ae;hb=81d75cc162f3653254c30b4b5be8687aaa0d62a2;hp=0cd0fdc578abdb7289cc8c921eab7104ac6ae973;hpb=4e7cb7ef0daba6c4b09cdc4ff3fed6cee0523a7e;p=platform%2Fupstream%2Flibzypp.git

diff --git a/zypp/sat/detail/PoolMember.h b/zypp/sat/detail/PoolMember.h
index 0cd0fdc..6819e51 100644
--- a/zypp/sat/detail/PoolMember.h
+++ b/zypp/sat/detail/PoolMember.h
@@ -12,6 +12,8 @@
 #ifndef ZYPP_SAT_DETAIL_POOLMEMBER_H
 #define ZYPP_SAT_DETAIL_POOLMEMBER_H
 
+#include <solv/solvversion.h>
+
 #include "zypp/base/Tr1hash.h"
 #include "zypp/base/Iterator.h"
 #include "zypp/base/String.h"
@@ -19,9 +21,28 @@
 
 extern "C"
 {
-struct _Solvable;
-struct _Repo;
-struct _Pool;
+  // Those _Type names are exposed as sat::detail::CType below!
+#if ( LIBSOLV_VERSION >= 700 )
+  struct s_Dataiterator;
+  struct s_Datamatcher;
+  struct s_Map;
+  struct s_Pool;
+  struct s_Queue;
+  struct s_Repo;
+  struct s_Solvable;
+  struct s_Solver;
+  struct s_Transaction;
+#else
+  struct _Dataiterator;
+  struct _Datamatcher;
+  struct _Map;
+  struct _Pool;
+  struct _Queue;
+  struct _Repo;
+  struct _Solvable;
+  struct _Solver;
+  struct _Transaction;
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -45,6 +66,33 @@ namespace zypp
   namespace sat
   { /////////////////////////////////////////////////////////////////
 
+    ///////////////////////////////////////////////////////////////////
+    namespace detail
+    {
+#if ( LIBSOLV_VERSION >= 700 )
+      typedef ::s_Dataiterator	CDataiterator;	///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::s_Datamatcher	CDatamatcher;	///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::s_Map		CMap;		///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::s_Pool		CPool;		///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::s_Queue		CQueue;		///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::s_Repo		CRepo;		///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::s_Solvable	CSolvable;	///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::s_Solver	CSolver;	///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::s_Transaction	CTransaction;	///< Wrapped libsolv C data type exposed as backdoor
+#else
+      typedef ::_Dataiterator	CDataiterator;	///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::_Datamatcher	CDatamatcher;	///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::_Map		CMap;		///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::_Pool		CPool;		///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::_Queue		CQueue;		///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::_Repo		CRepo;		///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::_Solvable	CSolvable;	///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::_Solver		CSolver;	///< Wrapped libsolv C data type exposed as backdoor
+      typedef ::_Transaction	CTransaction;	///< Wrapped libsolv C data type exposed as backdoor
+#endif
+    } // namespace detail
+    ///////////////////////////////////////////////////////////////////
+
     class Pool;
     class Solvable;
 
@@ -103,7 +151,7 @@ namespace zypp
       static const SolvableIdType systemSolvableId( 1 );
 
       /** Id type to connect \ref Repo and sat-repo. */
-      typedef ::_Repo * RepoIdType;
+      typedef CRepo * RepoIdType;
       /** Id to denote \ref Repo::noRepository. */
       static const RepoIdType noRepoId( 0 );