Author: mlschroe Date: Sat Oct 27 01:01:13 2007 New Revision: 7671 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7671&view=rev Log: - no more bool, too many conflicts - moved declaration of pool_freerepo to repo.h Modified: trunk/sat-solver/src/pool.h trunk/sat-solver/src/repo.h trunk/sat-solver/testsuite/deptestomatic.c Modified: trunk/sat-solver/src/pool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.h?rev=7671&r1=7670&r2=7671&view=diff ============================================================================== --- trunk/sat-solver/src/pool.h (original) +++ trunk/sat-solver/src/pool.h Sat Oct 27 01:01:13 2007 @@ -16,12 +16,6 @@ #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 @@ 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 void pool_free(Pool *pool); /** - * ???? - */ -extern void pool_freerepo(Pool *pool, Repo *repo); -/** * Prepares a pool for solving */ extern void pool_prepare(Pool *pool); Modified: trunk/sat-solver/src/repo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo.h?rev=7671&r1=7670&r2=7671&view=diff ============================================================================== --- trunk/sat-solver/src/repo.h (original) +++ trunk/sat-solver/src/repo.h Sat Oct 27 01:01:13 2007 @@ -29,6 +29,7 @@ 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) { Modified: trunk/sat-solver/testsuite/deptestomatic.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/deptestomatic.c?rev=7671&r1=7670&r2=7671&view=diff ============================================================================== --- trunk/sat-solver/testsuite/deptestomatic.c (original) +++ trunk/sat-solver/testsuite/deptestomatic.c Sat Oct 27 01:01:13 2007 @@ -166,11 +166,11 @@ Id arch; // set architecture - bool fixsystem; - bool updatesystem; - bool allowdowngrade; - bool allowuninstall; - bool allowvirtualconflicts; + int fixsystem; + int updatesystem; + int allowdowngrade; + int allowuninstall; + int allowvirtualconflicts; struct stateswitch *swtab[NUMSTATES]; enum state sbtab[NUMSTATES]; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org