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

---
 Makefile  | 3 ---
 config.mk | 2 +-
 expac.c   | 6 ------
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index d928fda..88cc8b8 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,6 @@ OBJ = ${SRC:.c=.o}
 
 all: expac doc
 
-35:
-	${MAKE} PMCHECK=-D_HAVE_ALPM_FIND_SATISFIER all
-
 .c.o:
 	${CC} -c ${CFLAGS} $<
 
diff --git a/config.mk b/config.mk
index 26cf63d..3d66992 100644
--- a/config.mk
+++ b/config.mk
@@ -7,6 +7,6 @@ MANPREFIX ?= ${PREFIX}/share/man
 
 # compiler flags
 CC ?= c99
-CPPFLAGS += -DVERSION=\"${VERSION}\" ${PMCHECK} 
+CPPFLAGS += -DVERSION=\"${VERSION}\"
 CFLAGS += -std=c99 -g -pedantic -Wall -Wextra ${CPPFLAGS}
 LDFLAGS += -lalpm
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-70-g09d2