Attachment 5833 Details for Bug 7145 – C89 fixes (patch against xorg-server 1.1.0)

[patch] C89 fixes (patch against xorg-server 1.1.0)

xorg-c89.diff (text/plain), 1.53 KB, created by Jens Granseuer on 2006-06-07 01:46:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Granseuer

Created: 2006-06-07 01:46:02 UTC

Size: 1.53 KB

patch

obsolete

>--- exa/exa.orig	Sun Jun  4 20:44:34 2006
>+++ exa/exa.c	Sun Jun  4 20:45:39 2006
>@@ -523,6 +523,9 @@ exaDriverInit (ScreenPtr		pScreen,
>                ExaDriverPtr	pScreenInfo)
> {
>     ExaScreenPrivPtr pExaScr;
>+#ifdef RENDER
>+    PictureScreenPtr ps;
>+#endif
> 
>     if (pScreenInfo->exa_major != EXA_VERSION_MAJOR ||
> 	pScreenInfo->exa_minor > EXA_VERSION_MINOR)
>@@ -536,7 +539,7 @@ exaDriverInit (ScreenPtr		pScreen,
>     }
> 
> #ifdef RENDER
>-    PictureScreenPtr	ps = GetPictureScreenIfSet(pScreen);
>+    ps = GetPictureScreenIfSet(pScreen);
> #endif
>     if (exaGeneration != serverGeneration)
>     {
>--- hw/xfree86/common/xf86Config.orig	Sun Jun  4 20:51:23 2006
>+++ hw/xfree86/common/xf86Config.c	Sun Jun  4 20:52:49 2006
>@@ -608,6 +608,9 @@ static Bool
> configFiles(XF86ConfFilesPtr fileconf)
> {
>   MessageType pathFrom = X_DEFAULT;
>+  int countDirs;
>+  char *temp_path;
>+  char *log_buf;
> 
>   /* FontPath */
> 
>@@ -667,13 +670,13 @@ configFiles(XF86ConfFilesPtr fileconf)
>     FatalError("No valid FontPath could be found.");
> 
>   /* make fontpath more readable in the logfiles */
>-  int countDirs = 1;
>-  char *temp_path = defaultFontPath;
>+  countDirs = 1;
>+  temp_path = defaultFontPath;
>   while((temp_path = index(temp_path, ',')) != NULL) {
>     countDirs++;
>     temp_path++;
>   }
>-  char *log_buf = xnfalloc(strlen(defaultFontPath) + (2 * countDirs) + 1);
>+  log_buf = xnfalloc(strlen(defaultFontPath) + (2 * countDirs) + 1);
>   if(!log_buf) /* fallback to old method */
>     xf86Msg(pathFrom, "FontPath set to \"%s\"\n", defaultFontPath);
>   else {

Actions: View | Splinter Review

Attachments on bug 7145: 5833 | 8986 | 8987

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.