From 7511a4b71ec0581a9d478d1a50887957f0d719e9 Mon Sep 17 00:00:00 2001
From: Dave Reisner <d@falconindy.com>
Date: Wed, 23 Mar 2011 22:34:02 -0400
Subject: remove preproc logic for pacman 3.4.3/3.5.0

---
 expac.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'expac.c')

diff --git a/expac.c b/expac.c
index 55bd263..dc513d1 100644
--- a/expac.c
+++ b/expac.c
@@ -106,11 +106,7 @@ static int alpm_init(void) {
     return ret;
   }
 
-#ifdef _HAVE_ALPM_DB_REGISTER_LOCAL
-  db_local = alpm_db_register_local();
-#else
   db_local = alpm_option_get_localdb();
-#endif
   if (!db_local) {
     return 1;
   }
@@ -510,12 +506,10 @@ static alpm_list_t *resolve_pkg(alpm_list_t *targets) {
         }
 
         pkg = alpm_db_get_pkg(repo, pkgname);
-#ifdef _HAVE_ALPM_FIND_SATISFIER
         /* try to resolve as provide (e.g. awk => gawk) */
         if (!pkg) {
           pkg = alpm_find_satisfier(alpm_db_get_pkgcache(repo), pkgname);
         }
-#endif
 
         if (!pkg) {
           if (verbose) {
-- 
cgit v1.2.3-54-g00ecf