libalpm util.c and util.h cleanup

* Remove some unnecessary conditional compiling in util.h- move the
  functions tha required it to trans.c (along with a bunch of new header
  includes).
* Clean up util.h a bit- remove some header includes, remove universal
  libarchive include and only put it in the files that need it.

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h
index 11f15f85..eb152a04 100644
--- a/lib/libalpm/trans.h
+++ b/lib/libalpm/trans.h
@@ -79,6 +79,12 @@ int _alpm_trans_addtarget(pmtrans_t *trans, char *target);
 int _alpm_trans_prepare(pmtrans_t *trans, alpm_list_t **data);
 int _alpm_trans_commit(pmtrans_t *trans, alpm_list_t **data);
 int _alpm_trans_update_depends(pmtrans_t *trans, pmpkg_t *pkg);
+int _alpm_runscriptlet(const char *root, const char *installfn,
+                       const char *script, const char *ver,
+                       const char *oldver, pmtrans_t *trans);
+#ifndef __sun__
+int _alpm_check_freespace(pmtrans_t *trans, alpm_list_t **data);
+#endif
 
 #endif /* _ALPM_TRANS_H */