diff options
| author | Dan McGee <dan@archlinux.org> | 2007-02-09 21:54:57 +0000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-02-09 21:54:57 +0000 |
| commit | 73402a14599d4bdb72e68c133414b5bfb4ef062b (patch) | |
| tree | dd2f469d83215a5f6c87c4bf4e2a038d0bb8a835 | |
| parent | f8cd4858ca35400eaf9e298ff3e0e9c245e0d1e3 (diff) | |
| download | pacman-73402a14599d4bdb72e68c133414b5bfb4ef062b.tar.xz | |
* Fix compile errors/warnings.
* Update .cvsignore files a bit.
| -rw-r--r-- | .cvsignore | 3 | ||||
| -rw-r--r-- | doc/.cvsignore | 3 | ||||
| -rw-r--r-- | lib/libalpm/alpm.c | 1 | ||||
| -rw-r--r-- | lib/libalpm/package.c | 3 | ||||
| -rw-r--r-- | lib/libalpm/po/.cvsignore | 2 | ||||
| -rw-r--r-- | lib/libalpm/versioncmp.h | 2 | ||||
| -rw-r--r-- | src/pacman/po/.cvsignore | 2 | ||||
| -rw-r--r-- | src/util/.cvsignore | 1 |
8 files changed, 7 insertions, 10 deletions
@@ -16,3 +16,6 @@ libtool ltmain.sh missing stamp-h1 + +tags +cscope.out diff --git a/doc/.cvsignore b/doc/.cvsignore index 1053b92b..a55527b2 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -1,4 +1,3 @@ Makefile Makefile.in -*.3 -*.8 +man3 diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index a366562d..5872b139 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -1146,7 +1146,6 @@ alpm_list_t *alpm_get_upgrades() /* now do normal upgrades */ for(i = _alpm_db_get_pkgcache(handle->db_local, INFRQ_NONE); i; i = i->next) { - int cmp; int replace=0; pmpkg_t *local = i->data; pmpkg_t *spkg = NULL; diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 2a9144a7..efc2345a 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -31,13 +31,14 @@ #include <locale.h> #include <errno.h> /* pacman */ +#include "package.h" #include "log.h" #include "util.h" #include "error.h" #include "alpm_list.h" -#include "package.h" #include "db.h" #include "handle.h" +#include "versioncmp.h" #include "alpm.h" pmpkg_t *_alpm_pkg_new(const char *name, const char *version) diff --git a/lib/libalpm/po/.cvsignore b/lib/libalpm/po/.cvsignore index 225235bc..50a7b2a4 100644 --- a/lib/libalpm/po/.cvsignore +++ b/lib/libalpm/po/.cvsignore @@ -3,6 +3,4 @@ Makefile.in *.gmo POTFILES stamp-po - -remove-potcdate.sin remove-potcdate.sed diff --git a/lib/libalpm/versioncmp.h b/lib/libalpm/versioncmp.h index 5ce3c286..5614ada3 100644 --- a/lib/libalpm/versioncmp.h +++ b/lib/libalpm/versioncmp.h @@ -27,7 +27,7 @@ #include "package.h" int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep); -int _alpm_versioncmp(const char *a, const char *b) +int _alpm_versioncmp(const char *a, const char *b); #endif diff --git a/src/pacman/po/.cvsignore b/src/pacman/po/.cvsignore index 225235bc..50a7b2a4 100644 --- a/src/pacman/po/.cvsignore +++ b/src/pacman/po/.cvsignore @@ -3,6 +3,4 @@ Makefile.in *.gmo POTFILES stamp-po - -remove-potcdate.sin remove-potcdate.sed diff --git a/src/util/.cvsignore b/src/util/.cvsignore index c1da130f..7fd89e3a 100644 --- a/src/util/.cvsignore +++ b/src/util/.cvsignore @@ -2,5 +2,4 @@ .libs Makefile Makefile.in -convertdb vercmp |