>From 0876db710c8855e1efb9befbc4960b26fb19441b Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Tue, 19 May 2015 13:24:18 +0200 Subject: [PATCH] sss_client: Fix warning "_" redefined "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) ^ --- src/sss_client/pam_message.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sss_client/pam_message.h b/src/sss_client/pam_message.h index 1c8dd381adb3dd1127a5107c863ed07b996828d5..3b3841a2c66b46d78855164099684ef2ac98ed77 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; -- 2.4.1