From cad41d7e8a363276cf860b21b693ea1191eaf122 Mon Sep 17 00:00:00 2001 From: Aurelien Foret Date: Wed, 23 Mar 2005 20:06:58 +0000 Subject: [PATCH] - removed db_find_conflicts() declaration from db.h - included conflict.h from add.c --- lib/libalpm/add.c | 1 + lib/libalpm/db.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 45f52231..4ec06916 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -39,6 +39,7 @@ #include "package.h" #include "db.h" #include "provide.h" +#include "conflict.h" #include "trans.h" #include "deps.h" #include "add.h" diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 2f0ec279..c3efdc29 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -58,8 +58,6 @@ int db_read(pmdb_t *db, char *name, unsigned int inforeq, pmpkg_t *info); int db_write(pmdb_t *db, pmpkg_t *info, unsigned int inforeq); int db_remove(pmdb_t *db, pmpkg_t *info); -PMList *db_find_conflicts(pmdb_t *db, PMList *targets, char *root); - #endif /* _ALPM_DB_H */ /* vim: set ts=2 sw=2 noet: */