Merge remote-tracking branch 'allan/ALPM'

Conflicts:
	lib/libalpm/be_local.c
	lib/libalpm/be_package.c
	lib/libalpm/conflict.c
	lib/libalpm/diskspace.c
	lib/libalpm/dload.c
	lib/libalpm/remove.c

1 files changed, 3 insertions, 3 deletions

diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c
index 70fb7607..08d8a557 100644
--- a/src/util/cleanupdelta.c
+++ b/src/util/cleanupdelta.c
@@ -43,9 +43,9 @@ static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args)
 {
 	if(strlen(fmt)) {
 		switch(level) {
-			case PM_LOG_ERROR: printf("error: "); break;
-			case PM_LOG_WARNING: printf("warning: "); break;
-			//case PM_LOG_DEBUG: printf("debug: "); break;
+			case ALPM_LOG_ERROR: printf("error: "); break;
+			case ALPM_LOG_WARNING: printf("warning: "); break;
+			//case ALPM_LOG_DEBUG: printf("debug: "); break;
 			default: return;
 		}
 		vprintf(fmt, args);