- no more bool, too many conflicts

- moved declaration of pool_freerepo to repo.h

diff --git a/src/pool.h b/src/pool.h
index 1ed47709697e1227e9002e02be1a90c998e5dcd2..d3254cd465592f181683f6832772c8cb26c72f74 100644 (file)
--- a/src/pool.h
+++ b/src/pool.h
@@ -16,12 +16,6 @@ extern "C" {
 #include "solvable.h"
 #include "queue.h"
 
-// bool
-#ifndef __cplusplus
-#ifndef SWIG
- typedef _Bool bool;
-#endif
-#endif
 // see initpool_data[] in pool.c
 
 /* well known ids */
@@ -81,7 +75,7 @@ struct _Pool {
   Solvable *solvables;
   int nsolvables;
 
-  bool promoteepoch;
+  int promoteepoch;
 
   Id *id2arch;                 /* map arch ids to scores */
   Id lastarch;                 /* last valid entry in id2arch */
@@ -152,10 +146,6 @@ extern Pool *pool_create(void);
  * Delete a pool
  */
 extern void pool_free(Pool *pool);
-/**
- * ????
- */
-extern void pool_freerepo(Pool *pool, Repo *repo);
 /**
  * Prepares a pool for solving
  */

diff --git a/src/repo.h b/src/repo.h
index 19c6001a179b3f78744b7f05e2e50f12d6048604..c0040a367137ab95a770a59a763920e2003287c1 100644 (file)
--- a/src/repo.h
+++ b/src/repo.h
@@ -29,6 +29,7 @@ extern unsigned int repo_reserve_ids(Repo *repo, unsigned int olddeps, int num);
 extern unsigned int repo_fix_legacy(Repo *repo, unsigned int provides, unsigned int supplements);
 
 extern Repo *pool_addrepo_empty(Pool *pool);
+extern void pool_freerepo(Pool *pool, Repo *repo);
 
 static inline const char *repo_name(const Repo *repo)
 {