Attachment 15150 Details for Bug 15032 – 0001-Compile-warning-fixes.patch

[patch] 0001-Compile-warning-fixes.patch

0001-Compile-warning-fixes.patch (text/plain), 2.15 KB, created by Paulo César Pereira de Andrade on 2008-03-15 15:54:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-03-15 15:54:53 UTC

Size: 2.15 KB

patch

obsolete

>From 56d31fc2bca3adf399ac3e119b9b02b1536f2121 Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Sat, 15 Mar 2008 19:52:35 -0300
>Subject: [PATCH] Compile warning fixes.
>
>  Add unistd.h for getpagesize and usleep prototypes.
>  Change local variables from int to long to match returned type.
>  Consistent macro naming in tga_pcirename.h.
>---
> src/tga_driver.c    |    1 +
> src/tga_line.c      |    4 ++--
> src/tga_pcirename.h |    6 +++---
> 3 files changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/src/tga_driver.c b/src/tga_driver.c
>index acdf16b..d58f716 100644
>--- a/src/tga_driver.c
>+++ b/src/tga_driver.c
>@@ -29,6 +29,7 @@
> #endif
> 
> #include <string.h>
>+#include <unistd.h>
> 
> /* everybody includes these */
> #include "xf86.h"
>diff --git a/src/tga_line.c b/src/tga_line.c
>index 5625c31..3879e46 100644
>--- a/src/tga_line.c
>+++ b/src/tga_line.c
>@@ -111,7 +111,7 @@ TGAPolySegment(
>   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
>   BoxPtr pboxInit = REGION_RECTS(pGC->pCompositeClip);
>   int nboxInit = REGION_NUM_RECTS(pGC->pCompositeClip);
>-  unsigned int bias = miGetZeroLineBias(pDrawable->pScreen);
>+  unsigned long bias = miGetZeroLineBias(pDrawable->pScreen);
>   int xorg = pDrawable->x;
>   int yorg = pDrawable->y;
>   int nbox;
>@@ -423,7 +423,7 @@ TGAPolySegment(
> #endif
>     BoxPtr pboxInit = REGION_RECTS(pGC->pCompositeClip);
>     int nboxInit = REGION_NUM_RECTS(pGC->pCompositeClip);
>-    unsigned int bias = miGetZeroLineBias(pDrawable->pScreen);
>+    unsigned long bias = miGetZeroLineBias(pDrawable->pScreen);
>     int xorg = pDrawable->x;
>     int yorg = pDrawable->y;
>     int nbox;
>diff --git a/src/tga_pcirename.h b/src/tga_pcirename.h
>index f0f5cf8..e44f356 100644
>--- a/src/tga_pcirename.h
>+++ b/src/tga_pcirename.h
>@@ -26,8 +26,8 @@
>  * library. The main purpose being to facilitate source code compatibility.
>  */
> 
>-#ifndef CIRPCIRENAME_H
>-#define CIRPCIRENAME_H
>+#ifndef TGAPCIRENAME_H
>+#define TGAPCIRENAME_H
> 
> enum region_type {
>     REGION_MEM,
>@@ -119,4 +119,4 @@ typedef struct pci_device *pciVideoPtr;
> 
> #endif /* XSERVER_LIBPCIACCESS */
> 
>-#endif /* CIRPCIRENAME_H */
>+#endif /* TGAPCIRENAME_H */
>-- 
>1.5.3.2
>

Actions: View | Splinter Review

Attachments on bug 15032: 15150

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.