Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/util.h
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-04-26 19:39:53 -0400
committerDan McGee <dan@archlinux.org>2007-04-26 19:39:53 -0400
commit75efcbbff6a9e1db543f04693f70780413369a85 (patch)
tree0f618ec7c679803820ab37d96f093f736c42ae03 /lib/libalpm/util.h
parent63588aff191f5bf982cc0c8ee8af2b46de084c4b (diff)
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 <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/util.h')
-rw-r--r--lib/libalpm/util.h7
1 files changed, 2 insertions, 5 deletions
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 <stdio.h>
-#if defined(__OpenBSD__)
-#include "/usr/local/include/archive.h"
-#include "/usr/local/include/archive_entry.h"
-#else
+#include <libintl.h> /* here so it doesn't need to be included elsewhere */
#include <archive.h>
#include <archive_entry.h>
-#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