From 29d01b49c15305d8f763fcbae0c158abc3393043 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Fri, 26 Oct 2007 23:01:13 +0000 Subject: [PATCH] - no more bool, too many conflicts - moved declaration of pool_freerepo to repo.h --- src/pool.h | 12 +----------- src/repo.h | 1 + 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/pool.h b/src/pool.h index 1ed4770..d3254cd 100644 --- 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 */ @@ -153,10 +147,6 @@ extern Pool *pool_create(void); */ extern void pool_free(Pool *pool); /** - * ???? - */ -extern void pool_freerepo(Pool *pool, Repo *repo); -/** * Prepares a pool for solving */ extern void pool_prepare(Pool *pool); diff --git a/src/repo.h b/src/repo.h index 19c6001..c0040a3 100644 --- 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) { -- 2.7.4