[pulseaudio-commits] src/modules

[David Henningsson]

 src/modules/alsa/alsa-mixer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 737a6180d44c3f4dbe9def42e38c47665b28af15
Author: Deng Zhenrong <dzrongg at gmail.com>
Date:   Thu Mar 22 21:52:12 2012 +0800

    fix compilation warning via PRI prefix
    
    modules/alsa/alsa-mixer.c:3110:21:
        warning: format '%lx' expects argument of type 'long unsigned int', but argument 7 has type 'pa_channel_position_mask_t' [-Wformat]
    modules/alsa/alsa-mixer.c:3110:21:
        warning: format '%lx' expects argument of type 'long unsigned int', but argument 8 has type 'pa_channel_position_mask_t' [-Wformat]
    
    pa_channel_position_mask_t is type defined to uint64_t, and to display
    uint64_t, it's better to use PRIx64 primitives.
    
    Signed-off-by: Deng Zhenrong <dzrongg at gmail.com>

diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 102ec82..2e768e9 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -3107,7 +3107,7 @@ static pa_bool_t element_is_subset(pa_alsa_element *a, pa_alsa_element *b, snd_m
                 return FALSE;
             for (s = 0; s < SND_MIXER_SCHN_LAST; s++)
                 if (a->masks[s][a->n_channels-1] != b->masks[s][b->n_channels-1]) {
-                    pa_log_debug("Element %s is not a subset - mask a: 0x%lx, mask b: 0x%lx, at channel %d",
+                    pa_log_debug("Element %s is not a subset - mask a: 0x%" PRIx64 ", mask b: 0x%" PRIx64 ", at channel %d",
                         a->alsa_name, a->masks[s][a->n_channels-1], b->masks[s][b->n_channels-1], s);
                     return FALSE;
                }