From 75efcbbff6a9e1db543f04693f70780413369a85 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 26 Apr 2007 19:39:53 -0400 Subject: Clean up gettext on the libalpm side Remove inclusion of libintl.h from all files, because we can do it once in util.c where the _() macro is defined. Signed-off-by: Dan McGee --- lib/libalpm/add.c | 1 - lib/libalpm/alpm.c | 1 - lib/libalpm/be_files.c | 1 - lib/libalpm/cache.c | 1 - lib/libalpm/conflict.c | 1 - lib/libalpm/db.c | 1 - lib/libalpm/deps.c | 1 - lib/libalpm/error.c | 2 -- lib/libalpm/group.c | 1 - lib/libalpm/handle.c | 1 - lib/libalpm/md5driver.c | 1 - lib/libalpm/package.c | 1 - lib/libalpm/remove.c | 1 - lib/libalpm/server.c | 1 - lib/libalpm/sha1.c | 1 - lib/libalpm/sync.c | 1 - lib/libalpm/trans.c | 1 - lib/libalpm/util.c | 1 - lib/libalpm/util.h | 7 ++----- lib/libalpm/versioncmp.c | 1 - 20 files changed, 2 insertions(+), 25 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ddeca317..3c6aebd9 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -38,7 +38,6 @@ #include #include #include -#include /* libalpm */ #include "add.h" diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index b4faf571..74c07107 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -37,7 +37,6 @@ #include #include /* PATH_MAX */ #include -#include /* libalpm */ #include "alpm.h" diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index f3619277..045424c0 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -32,7 +32,6 @@ #endif #include #include -#include #include #ifdef CYGWIN #include /* PATH_MAX */ diff --git a/lib/libalpm/cache.c b/lib/libalpm/cache.c index ed893470..5f9b5fd0 100644 --- a/lib/libalpm/cache.c +++ b/lib/libalpm/cache.c @@ -27,7 +27,6 @@ #include #include #include -#include /* libalpm */ #include "cache.h" diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 3ab4ee71..472a4f69 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -34,7 +34,6 @@ #include #endif #include -#include /* libalpm */ #include "conflict.h" diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 148c32dc..183f71d3 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -36,7 +36,6 @@ #include #endif #include -#include #include #ifdef CYGWIN #include /* PATH_MAX */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 9295fabe..3fdf0676 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -29,7 +29,6 @@ #ifdef __sun__ #include #endif -#include #include /* libalpm */ diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index ece8a521..aa930b9e 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -24,8 +24,6 @@ #include "config.h" -#include - /* libalpm */ #include "error.h" #include "util.h" diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c index cce05213..cd68cb17 100644 --- a/lib/libalpm/group.c +++ b/lib/libalpm/group.c @@ -24,7 +24,6 @@ #include #include #include -#include /* libalpm */ #include "group.h" diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index a6bb5bc8..82a52320 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -29,7 +29,6 @@ #include #include #include -#include #include /* libalpm */ diff --git a/lib/libalpm/md5driver.c b/lib/libalpm/md5driver.c index 66071052..4ef3c352 100644 --- a/lib/libalpm/md5driver.c +++ b/lib/libalpm/md5driver.c @@ -24,7 +24,6 @@ documentation and/or software. #include #include #include -#include /* libalpm */ #include "alpm.h" diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 4f3d13cd..531d91a2 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 1284aaa9..943d4604 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -39,7 +39,6 @@ #endif #include #include -#include /* libalpm */ #include "remove.h" diff --git a/lib/libalpm/server.c b/lib/libalpm/server.c index 519c5084..b9182a02 100644 --- a/lib/libalpm/server.c +++ b/lib/libalpm/server.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/libalpm/sha1.c b/lib/libalpm/sha1.c index fd5f1e4a..5f47ebb8 100644 --- a/lib/libalpm/sha1.c +++ b/lib/libalpm/sha1.c @@ -27,7 +27,6 @@ #include #include #include -#include /* libalpm */ #include "sha1.h" diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 8405bbfb..4e0a1988 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -33,7 +33,6 @@ #include /* PATH_MAX */ #endif #include -#include /* libalpm */ #include "sync.h" diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 009ec7f1..b5dfbd96 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -27,7 +27,6 @@ #include #include #include -#include /* libalpm */ #include "trans.h" diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index decb5959..715de218 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -45,7 +45,6 @@ #if defined(__APPLE__) || defined(__OpenBSD__) || defined(__sun__) #include #endif -#include #ifdef CYGWIN #include /* PATH_MAX */ #endif diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 9f028e8a..c4131795 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -26,13 +26,9 @@ #define _ALPM_UTIL_H #include -#if defined(__OpenBSD__) -#include "/usr/local/include/archive.h" -#include "/usr/local/include/archive_entry.h" -#else +#include /* here so it doesn't need to be included elsewhere */ #include #include -#endif #define FREE(p) do { if (p) { free(p); p = NULL; } } while(0) @@ -45,6 +41,7 @@ #define ARCHIVE_EXTRACT_FLAGS ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_TIME +/* define _() as shortcut for gettext() */ #ifdef ENABLE_NLS #define _(str) dgettext ("libalpm", str) #else diff --git a/lib/libalpm/versioncmp.c b/lib/libalpm/versioncmp.c index 7e22ec9c..79dfaac9 100644 --- a/lib/libalpm/versioncmp.c +++ b/lib/libalpm/versioncmp.c @@ -27,7 +27,6 @@ #include #include #include -#include /* libalpm */ #include "versioncmp.h" -- cgit v1.2.3-24-g4f1b