From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0OI-0006P4-7y for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SY0OG-0004Xc-Ec for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38354) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SY0OG-0004XD-6P for qemu-devel@nongnu.org; Fri, 25 May 2012 15:41:36 -0400 From: Luiz Capitulino Date: Fri, 25 May 2012 16:41:12 -0300 Message-Id: <1337974879-3656-8-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1337974879-3656-1-git-send-email-lcapitulino@redhat.com> References: <1337974879-3656-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 07/14] omap_lcdc: rename ppm_save() to omap_ppm_save() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, alevy@redhat.com, armbru@redhat.com Avoids confusion with the global ppm_save() defined in hw/vga.c. Signed-off-by: Luiz Capitulino --- hw/omap_lcdc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c index 4a08e9d..6d2e83a 100644 --- a/hw/omap_lcdc.c +++ b/hw/omap_lcdc.c @@ -224,8 +224,8 @@ static void omap_update_display(void *opaque) omap_lcd->invalidate = 0; } -static int ppm_save(const char *filename, uint8_t *data, - int w, int h, int linesize) +static int omap_ppm_save(const char *filename, uint8_t *data, + int w, int h, int linesize) { FILE *f; uint8_t *d, *d1; @@ -270,9 +270,9 @@ static void omap_screen_dump(void *opaque, const char *filename, bool cswitch) omap_update_display(opaque); if (omap_lcd && ds_get_data(omap_lcd->state)) - ppm_save(filename, ds_get_data(omap_lcd->state), - omap_lcd->width, omap_lcd->height, - ds_get_linesize(omap_lcd->state)); + omap_ppm_save(filename, ds_get_data(omap_lcd->state), + omap_lcd->width, omap_lcd->height, + ds_get_linesize(omap_lcd->state)); } static void omap_invalidate_display(void *opaque) { -- 1.7.10.2.565.gbd578b5