diff options
| author | Allan McRae <allan@archlinux.org> | 2013-12-21 09:04:41 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-01-06 05:38:49 +0100 |
| commit | 452ee39de180c5c77f2f264d38a7c4d5925c1099 (patch) | |
| tree | cff040482fa31d10f2c3237eb7307121a3d0aa08 | |
| parent | f7f8964c2315c81939798e870f96083146bbb27c (diff) | |
| download | pacman-452ee39de180c5c77f2f264d38a7c4d5925c1099.tar.gz pacman-452ee39de180c5c77f2f264d38a7c4d5925c1099.tar.xz | |
Fix build warnings with --disable-nls
The gettext functions return a "char *", so do the same for the defines
in the case where gettext is unavailable. This prevents a number of
warnings about const being dropped.
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | lib/libalpm/util.h | 2 | ||||
| -rw-r--r-- | src/pacman/util.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index c12b39b7..2142171c 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -47,7 +47,7 @@ /* define _() as shortcut for gettext() */ #define _(str) dgettext ("libalpm", str) #else -#define _(s) s +#define _(s) (char *)s #endif void _alpm_alloc_fail(size_t size); diff --git a/src/pacman/util.h b/src/pacman/util.h index e2297f81..9920e74a 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -34,8 +34,8 @@ #define _(str) gettext(str) #define _n(str1, str2, ct) ngettext(str1, str2, ct) #else -#define _(str) str -#define _n(str1, str2, ct) (ct == 1 ? str1 : str2) +#define _(str) (char *)str +#define _n(str1, str2, ct) (char *)(ct == 1 ? str1 : str2) #endif typedef struct _pm_target_t { |