Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=1a9cd3d713c1e30d11b9a5ac7d511d99a68a3226
commit 1a9cd3d713c1e30d11b9a5ac7d511d99a68a3226 Author: Michel Hermier <herm...@frugalware.org> Date: Wed Dec 11 09:35:10 2013 +0100 libpacman: Remove unecessary libarchive includes in util.h. diff --git a/lib/libpacman/fstdlib/canonicalize.c b/lib/libpacman/fstdlib/canonicalize.c index b0a2594..cc52fc1 100644 --- a/lib/libpacman/fstdlib/canonicalize.c +++ b/lib/libpacman/fstdlib/canonicalize.c @@ -21,9 +21,11 @@ #include "config.h" +#include <sys/stat.h> #include <assert.h> #include <errno.h> #include <limits.h> +#include <stddef.h> #include <unistd.h> #include "fstdlib.h" diff --git a/lib/libpacman/io/archive.h b/lib/libpacman/io/archive.h index e296b89..dd78ab6 100644 --- a/lib/libpacman/io/archive.h +++ b/lib/libpacman/io/archive.h @@ -22,6 +22,7 @@ #define _PACMAN_ARCHIVE_FILE_H #include <archive.h> +#include <archive_entry.h> struct archive *_pacman_archive_read_open_all_file(const char *file); FILE *_pacman_archive_read_fropen(struct archive *a); diff --git a/lib/libpacman/io/ffilelock.c b/lib/libpacman/io/ffilelock.c index 8ae9868..288514b 100644 --- a/lib/libpacman/io/ffilelock.c +++ b/lib/libpacman/io/ffilelock.c @@ -26,6 +26,7 @@ #include <sys/types.h> #include <fcntl.h> #include <limits.h> +#include <unistd.h> #include "io/ffilelock.h" diff --git a/lib/libpacman/remove.c b/lib/libpacman/remove.c index 4b46c4a..bab2d4f 100644 --- a/lib/libpacman/remove.c +++ b/lib/libpacman/remove.c @@ -23,14 +23,9 @@ * USA. */ -#if defined(__APPLE__) || defined(__OpenBSD__) -#include <sys/syslimits.h> -#endif -#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__sun__) -#include <sys/stat.h> -#endif - #include "config.h" + +#include <sys/stat.h> #include <stdlib.h> #include <errno.h> #include <time.h> diff --git a/lib/libpacman/util.h b/lib/libpacman/util.h index 2d36d60..9f3e174 100644 --- a/lib/libpacman/util.h +++ b/lib/libpacman/util.h @@ -28,13 +28,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#if defined(__OpenBSD__) -#include "/usr/local/include/archive.h" -#include "/usr/local/include/archive_entry.h" -#else -#include <archive.h> -#include <archive_entry.h> -#endif #include <libintl.h> #include "error.h" _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
