Imported Upstream version 0.6.29

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

diff --git a/src/pool.h b/src/pool.h
index 3eeea06..f6a5493 100644 (file)
--- a/src/pool.h
+++ b/src/pool.h
@@ -223,12 +223,14 @@ struct _Pool {
 #define REL_NAMESPACE  19
 #define REL_ARCH       20
 #define REL_FILECONFLICT       21
-#define REL_COND       22
+#define REL_COND       22      /* OR_NOT */
 #define REL_COMPAT     23
 #define REL_KIND       24      /* for filters only */
 #define REL_MULTIARCH  25      /* debian multiarch annotation */
-#define REL_ELSE       26      /* only as evr part of REL_COND */
+#define REL_ELSE       26      /* only as evr part of REL_COND/REL_UNLESS */
 #define REL_ERROR      27      /* parse errors and the like */
+#define REL_WITHOUT    28
+#define REL_UNLESS     29      /* AND_NOT */
 
 #if !defined(__GNUC__) && !defined(__attribute__)
 # define __attribute__(x)
@@ -398,11 +400,6 @@ void pool_add_fileconflicts_deps(Pool *pool, Queue *conflicts);
       continue;                                                                \
     else
 
-#ifdef ENABLE_COMPS
-#define ISCONDDEP(id) (ISRELDEP(id) && (GETRELDEP(pool, id))->flags == REL_COND)
-#define MODIFYCONDDEP(id, tst) do { Reldep *condrd = GETRELDEP(pool, id); Id condp, condpp; FOR_PROVIDES(condrd->evr, condp, condpp) if (tst) break; id = condp ? condrd->name : 0;} while(0)
-#endif
-
 #define POOL_DEBUG(type, ...) do {if ((pool->debugmask & (type)) != 0) pool_debug(pool, (type), __VA_ARGS__);} while (0)
 #define IF_POOLDEBUG(type) if ((pool->debugmask & (type)) != 0)