From 0a111b876c59ea7b5eab4b33449966d6005dc5b1 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Tue, 19 May 2015 13:24:18 +0200 Subject: sss_client: Fix warning "_" redefined MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "enum sss_authtok_type" is defined in sss_client/pam_message.h So it's better to include it instead of "util/authtok.h". "util/authtok.h" includes many header files including "util/util.h" CC src/util/crypto/nss/libsss_crypt_la-nss_base64.lo src/sss_client/pam_sss.c:48:0: error: "_" redefined [-Werror] #define _(STRING) dgettext (PACKAGE, STRING) ^ In file included from ../sssd/src/util/authtok.h:23:0, from ../sssd/src/sss_client/pam_message.h:29, from ../sssd/src/sss_client/pam_sss.c:43: src/util/util.h:55:0: note: this is the location of the previous definition #define _(STRING) gettext (STRING) ^ Reviewed-by: Pavel Březina --- src/sss_client/pam_message.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sss_client') diff --git a/src/sss_client/pam_message.h b/src/sss_client/pam_message.h index 1c8dd381a..3b3841a2c 100644 --- a/src/sss_client/pam_message.h +++ b/src/sss_client/pam_message.h @@ -26,7 +26,7 @@ #include #include -#include "util/authtok.h" +#include "sss_client/sss_cli.h" struct pam_items { const char *pam_service; -- cgit