gallium/va/radeonsi: Using private as a parameter name conflicts with C++ keywords

Reviewed-by: Leo Liu <leo.liu@amd.com>
Acked-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16286>

src/gallium/drivers/radeonsi/radeon_vcn_dec.c

@@ -166,7 +166,7 @@ static rvcn_dec_message_avc_t get_h264_msg(struct radeon_decoder *dec,
       goto end;
    }
 
-   private = pic->private;
+   private = pic->priv;
    for (i = 0; i < ARRAY_SIZE(private->past_ref); i++) {
       for (k = 0; private->past_ref[i] && (k < ARRAY_SIZE(pic->ref)); k++)
          if (pic->ref[k] && (private->past_ref[i] == pic->ref[k]))

src/gallium/frontends/va/picture_h264.c

@@ -45,7 +45,7 @@ static void vlVaGetPastReferenceFrame(vlVaDriver *drv, VASurfaceID surface_id,
 static void resetReferencePictureDesc(struct pipe_h264_picture_desc *h264,
                                       unsigned int i)
 {
-   struct h264_private *private = h264->private;
+   struct h264_private *private = h264->priv;
 
    h264->ref[i] = NULL;
    h264->frame_num_list[i] = 0;
@@ -68,7 +68,7 @@ void vlVaHandlePictureParameterBufferH264(vlVaDriver *drv, vlVaContext *context,
 
    assert(buf->size >= sizeof(VAPictureParameterBufferH264) && buf->num_elements == 1);
    context->desc.h264.slice_count = 0;
-   context->desc.h264.private = private;
+   context->desc.h264.priv = private;
    /*CurrPic*/
    context->desc.h264.field_order_cnt[0] = h264->CurrPic.TopFieldOrderCnt;
    context->desc.h264.field_order_cnt[1] = h264->CurrPic.BottomFieldOrderCnt;

src/gallium/include/pipe/p_video_state.h

@@ -353,7 +353,9 @@ struct pipe_h264_picture_desc
    uint32_t frame_num_list[16];
 
    struct pipe_video_buffer *ref[16];
-   void    *private;
+
+   /* using private as a parameter name conflicts with C++ keywords */
+   void    *priv;
 };
 
 struct pipe_h264_enc_rate_control