Merge pull request #44 from akozumpl/archs

[platform/upstream/libsolv.git] / src / pool.h

diff --git a/src/pool.h b/src/pool.h
index c0fdc3a..d29f615 100644 (file)
--- a/src/pool.h
+++ b/src/pool.h
@@ -7,7 +7,7 @@
 
 /*
  * pool.h
- * 
+ *
  */
 
 #ifndef LIBSOLV_POOL_H
@@ -49,7 +49,7 @@ typedef struct _Datapos {
   Id solvid;
   Id repodataid;
   Id schema;
-  Id dp; 
+  Id dp;
 } Datapos;
 
 struct _Pool_tmpspace {
@@ -213,6 +213,8 @@ struct _Pool {
 #define REL_FILECONFLICT       21
 #define REL_COND       22
 #define REL_COMPAT     23
+#define REL_KIND       24      /* for filters only */
+#define REL_MULTIARCH  25      /* debian multiarch annotation */
 
 #if !defined(__GNUC__) && !defined(__attribute__)
 # define __attribute__(x)
@@ -283,9 +285,12 @@ int solvable_is_irrelevant_patch(Solvable *s, Map *installedmap);
 
 void pool_create_state_maps(Pool *pool, Queue *installed, Map *installedmap, Map *conflictsmap);
 
-int pool_match_nevr_rel(Pool *pool, Solvable *s, Id d);
+int pool_intersect_evrs(Pool *pool, int pflags, Id pevr, int flags, int evr);
 int pool_match_dep(Pool *pool, Id d1, Id d2);
 
+/* semi private, used in pool_match_nevr */
+int pool_match_nevr_rel(Pool *pool, Solvable *s, Id d);
+
 static inline int pool_match_nevr(Pool *pool, Solvable *s, Id d)
 {
   if (!ISRELDEP(d))
@@ -329,7 +334,7 @@ static inline Id *pool_whatprovides_ptr(Pool *pool, Id d)
   return pool->whatprovidesdata + off;
 }
 
-void pool_whatmatchesdep(Pool *pool, Id keyname, Id dep, Queue *q);
+void pool_whatmatchesdep(Pool *pool, Id keyname, Id dep, Queue *q, int marker);
 
 /* search the pool. the following filters are available:
  *   p     - search just this solvable