On 05/19/2015 01:29 PM, Lukas Slebodnik wrote:
On (19/05/15 13:23), Pavel Březina wrote:
> Patch "sss_client: Fix mixed enums" introduced the following warning:
>
> /home/pbrezina/workspace/sssd/src/sss_client/pam_sss.c:48:0: error: "_"
> redefined [-Werror]
> #define _(STRING) dgettext (PACKAGE, STRING)
> ^
> In file included from /home/pbrezina/workspace/sssd/src/util/authtok.h:23:0,
> from
> /home/pbrezina/workspace/sssd/src/sss_client/pam_message.h:29,
> from
> /home/pbrezina/workspace/sssd/src/sss_client/pam_sss.c:43:
> /home/pbrezina/workspace/sssd/src/util/util.h:55:0: note: this is the
> location of the previous definition
> #define _(STRING) gettext (STRING)
>From 0bc3784b763ba362888d8b5f5804ab6153dbbc7e Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina(a)redhat.com>
> Date: Tue, 19 May 2015 13:21:36 +0200
> Subject: [PATCH] pam_sss: do not redefine _(STRING)
>
> Fixes:
> src/sss_client/pam_sss.c:48:0: error: "_" redefined [-Werror]
> #define _(STRING) dgettext (PACKAGE, STRING)
> ^
> In file included from src/util/authtok.h:23:0,
> from src/sss_client/pam_message.h:29,
> from 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)
> ---
NACK
The first review of my patch [1] was not very careful
and thus util.h is included in client code.
Attached is better patch.
LS
[1] commit 2ec676521edc2c6cd464b30e9b08d383ec23a9c4
Author: Lukas Slebodnik <lslebodn(a)redhat.com>
Date: Wed Apr 29 15:23:14 2015 +0200
sss_client: Fix mixed enums
That is better. Ack.