From d8cdd54a206a87a41ce66360f132e2d854a45af2 Mon Sep 17 00:00:00 2001
From: Aurelien Foret <aurelien@archlinux.org>
Date: Wed, 16 Mar 2005 20:46:30 +0000
Subject: Moved log callback definition to alpm.h

---
 lib/libalpm/alpm.h | 5 ++++-
 lib/libalpm/log.c  | 1 +
 lib/libalpm/log.h  | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib/libalpm')

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index c5df0d47..a2337576 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -61,6 +61,9 @@ int alpm_release();
 #define PM_LOG_FLOW2    0x10
 #define PM_LOG_FUNCTION 0x20
 
+/* Log callback */
+typedef void (*alpm_cb_log)(unsigned short, char *);
+
 int alpm_logaction(char *fmt, ...);
 
 /*
@@ -209,7 +212,7 @@ enum {
 	PM_TRANS_EVT_UPGRADE_DONE
 };
 
-/* Callback */
+/* Event callback */
 typedef void (*alpm_trans_cb)(unsigned short, void *, void *);
 
 /* Info parameters */
diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c
index c36851dc..2eff80e4 100644
--- a/lib/libalpm/log.c
+++ b/lib/libalpm/log.c
@@ -24,6 +24,7 @@
 #include <stdarg.h>
 #include <time.h>
 /* pacman */
+#include "alpm.h"
 #include "log.h"
 
 /* Internal library log mechanism */
diff --git a/lib/libalpm/log.h b/lib/libalpm/log.h
index e9a9a4f9..cdbd8c94 100644
--- a/lib/libalpm/log.h
+++ b/lib/libalpm/log.h
@@ -23,8 +23,6 @@
 
 #define LOG_STR_LEN 256
 
-typedef void (*alpm_cb_log)(unsigned short, char *);
-
 void _alpm_log(unsigned char flag, char *fmt, ...);
 
 int _alpm_log_action(unsigned char usesyslog, FILE *f, char *fmt, ...);
-- 
cgit v1.2.3-24-g4f1b