diff options
| author | Dan McGee <dan@archlinux.org> | 2007-03-05 23:13:33 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-03-05 23:13:33 +0100 |
| commit | 869e81e1cf115e835040d0ecadb6108880103abe (patch) | |
| tree | 2c67f7f304e27cfab2b9d7b1fd48f8b15a914dd4 /lib/libalpm/conflict.c | |
| parent | facb99098d8d28f7bd3ac1aeb02ab0e158f9cff2 (diff) | |
| download | pacman-869e81e1cf115e835040d0ecadb6108880103abe.tar.gz pacman-869e81e1cf115e835040d0ecadb6108880103abe.tar.xz | |
This commit looks much more monumental than it is. Almost all just #include
reordering and adding ones that were forgotten (noticed when trying to
compile after reordering).
* Updated the HACKING file to include information on #include usage.
* print -> vprint in "making dir" function in pactest.
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 76e76901..80490233 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -23,28 +23,29 @@ * USA. */ -#if defined(__APPLE__) || defined(__OpenBSD__) -#include <sys/syslimits.h> -#endif - #include "config.h" + #include <stdlib.h> #include <stdio.h> #include <unistd.h> #include <string.h> #include <limits.h> +#if defined(__APPLE__) || defined(__OpenBSD__) +#include <sys/syslimits.h> +#endif #include <sys/stat.h> #include <libintl.h> -/* pacman */ -#include "handle.h" + +/* libalpm */ +#include "conflict.h" #include "alpm_list.h" +#include "handle.h" #include "trans.h" #include "util.h" #include "error.h" #include "log.h" #include "cache.h" #include "deps.h" -#include "conflict.h" /** See if potential conflict 'name' matches package 'pkg'. |