Attachment 979 Details for Bug 1489 – [FIXED_X11R68x] Patch for 2004-09-22-trunk

[patch] [FIXED_X11R68x] Patch for 2004-09-22-trunk

patch.gudiff (text/plain), 2.98 KB, created by Roland Mainz on 2004-09-28 21:16:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-09-28 21:16:50 UTC

Size: 2.98 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.403
>diff -u -2 -0 -r1.403 ChangeLog
>--- xc/ChangeLog	28 Sep 2004 20:50:01 -0000	1.403
>+++ xc/ChangeLog	29 Sep 2004 04:15:00 -0000
>@@ -1,20 +1,25 @@
>+2004-09-29 Roland Mainz <roland.mainz@nrubsig.org>
>+	* xc/programs/Xserver/os/utils.c
>+        Bugzilla #1489: Use |long| instead of |int| for BIGREQUESTS
>+        commandline option.
>+
> 2004-09-28  Adam Jackson  <ajax@freedesktop.org>
> 
> 	* programs/Xserver/Imakefile:
> 	Remove more xf24_32bpp references.
> 
> 2004-09-26  Matthieu Herrb  <matthieu.herrb@laas.fr>
> 
> 	* config/cf/OpenBSD.cf:
> 	Hook the wsfb driver and resynchonize with OpenBSD's version. 
> 	* programs/Xserver/hw/xfree86/drivers/wsfb/Imakefile:
> 	* programs/Xserver/hw/xfree86/drivers/wsfb/wsfb.man:
> 	* programs/Xserver/hw/xfree86/drivers/wsfb/wsfb_driver.c:
> 	Add wsfb, a Net- and OpenBSD specific driver for dumb bitmapped
> 	wsdisplay screens.
> 
> 2004-09-26  Adam Jackson  <ajax@freedesktop.org>
> 
> 	* programs/Xserver/hw/xfree86/common/Imakefile:
> 	Bug #1468: Add xorgVersion.h to the SDK (Bernhard Rosenkraenzer).
> 
>Index: xc/programs/Xserver/os/utils.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/os/utils.c,v
>retrieving revision 1.8
>diff -u -2 -0 -r1.8 utils.c
>--- xc/programs/Xserver/os/utils.c	24 Sep 2004 02:11:14 -0000	1.8
>+++ xc/programs/Xserver/os/utils.c	29 Sep 2004 04:15:21 -0000
>@@ -991,45 +991,45 @@
> 	}
> 	else if ( strcmp( argv[i], "-to") == 0)
> 	{
> 	    if(++i < argc)
> 		TimeOutValue = ((CARD32)atoi(argv[i])) * MILLI_PER_SECOND;
> 	    else
> 		UseMsg();
> 	}
> 	else if ( strcmp( argv[i], "-tst") == 0)
> 	{
> 	    noTestExtensions = TRUE;
> 	}
> 	else if ( strcmp( argv[i], "v") == 0)
> 	    defaultScreenSaverBlanking = PreferBlanking;
> 	else if ( strcmp( argv[i], "-v") == 0)
> 	    defaultScreenSaverBlanking = DontPreferBlanking;
> 	else if ( strcmp( argv[i], "-wm") == 0)
> 	    defaultBackingStore = WhenMapped;
>         else if ( strcmp( argv[i], "-maxbigreqsize") == 0) {
>              if(++i < argc) {
>-                 int reqSizeArg = atoi(argv[i]);
>+                 long reqSizeArg = atol(argv[i]);
> 
>                  /* Request size > 128MB does not make much sense... */
>-                 if( reqSizeArg > 0 && reqSizeArg < 128 ) {
>-                     maxBigRequestSize = (reqSizeArg * 1048576) - 1;
>+                 if( reqSizeArg > 0L && reqSizeArg < 128L ) {
>+                     maxBigRequestSize = (reqSizeArg * 1048576L) - 1L;
>                  }
>                  else
>                  {
>                      UseMsg();
>                  }
>              }
>              else
>              {
>                  UseMsg();
>              }
>          }
> #ifdef PANORAMIX
> 	else if ( strcmp( argv[i], "+xinerama") == 0){
> 	    noPanoramiXExtension = FALSE;
> 	}
> 	else if ( strcmp( argv[i], "-xinerama") == 0){
> 	    noPanoramiXExtension = TRUE;
> 	}
> #endif
> 	else if ( strcmp( argv[i], "-x") == 0)

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 1489: 979

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.