summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2005-03-23 21:06:58 +0100
committerAurelien Foret <aurelien@archlinux.org>2005-03-23 21:06:58 +0100
commitcad41d7e8a363276cf860b21b693ea1191eaf122 (patch)
treef874687375840e98c47d188ef8e6f0b0363ffb8e /lib
parentb232126e505bd46b29c0e291f99d7dc8b3a0edb7 (diff)
downloadpacman-cad41d7e8a363276cf860b21b693ea1191eaf122.tar.gz
pacman-cad41d7e8a363276cf860b21b693ea1191eaf122.tar.xz
- removed db_find_conflicts() declaration from db.h
- included conflict.h from add.c
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/add.c1
-rw-r--r--lib/libalpm/db.h2
2 files changed, 1 insertions, 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: */