X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fpool.h;h=f6a5493474a7c4f145f05bba7eefc1236fdec939;hb=refs%2Fchanges%2F99%2F194199%2F1;hp=3eeea0604f6a76230cf2461ec6641ed34256dc8d;hpb=e1659dc4ce74d3c47f465103951dafff8fc0cf9f;p=platform%2Fupstream%2Flibsolv.git

diff --git a/src/pool.h b/src/pool.h
index 3eeea06..f6a5493 100644
--- 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)