Attachment 1446 Details for Bug 1998 – Patch for 2004-12-02-trunk

[patch] Patch for 2004-12-02-trunk

patch.gudiff (text/plain), 3.02 KB, created by Roland Mainz on 2004-12-02 15:46:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-12-02 15:46:01 UTC

Size: 3.02 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.560
>diff -u -2 -0 -r1.560 ChangeLog
>--- xc/ChangeLog	2 Dec 2004 21:58:58 -0000	1.560
>+++ xc/ChangeLog	2 Dec 2004 23:43:37 -0000
>@@ -1,20 +1,26 @@
>+2004-12-02 Roland Mainz <roland.mainz@nrubsig.org>
>+        * xc/programs/Xserver/miext/damage/damagestr.h
>+        Bugzilla #1998 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1998):
>+        Fix Xserver standalone build when RENDER extension includes
>+        are not availabe.
>+
> 2004-12-02  Kristian Høgsberg  <krh@redhat.com>
> 
> 	* programs/Xserver/hw/xfree86/common/xf86.h:
> 	* programs/Xserver/include/os.h:
> 	Use __printf__ in gcc function attributes to avoid clash with libc
> 	wrapper define, and remove the last bits of the old workaround.
> 	
> 2004-12-02  Alexander Gottwald  <ago at freedesktop dot org>
> 
> 	* programs/Xserver/os/WaitFor.c:
> 	Remove some of the ifdef WIN32 checks from WaitForSomething
> 
> 2004-12-02  Alexander Gottwald  <ago at freedesktop dot org>
> 
> 	* config/cf/mingw.cf:
> 	Set HasFfs to NO
> 
> 	* programs/Xserver/Imakefile:
> 	Fix link order problems with mingw. Add libdix.a after libmi.a.
> 
>Index: xc/programs/Xserver/miext/damage/damagestr.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/miext/damage/damagestr.h,v
>retrieving revision 1.3
>diff -u -2 -0 -r1.3 damagestr.h
>--- xc/programs/Xserver/miext/damage/damagestr.h	11 Aug 2004 22:40:14 -0000	1.3
>+++ xc/programs/Xserver/miext/damage/damagestr.h	2 Dec 2004 23:43:56 -0000
>@@ -9,41 +9,43 @@
>  * copyright notice and this permission notice appear in supporting
>  * documentation, and that the name of Keith Packard not be used in
>  * advertising or publicity pertaining to distribution of the software without
>  * specific, written prior permission.  Keith Packard makes no
>  * representations about the suitability of this software for any purpose.  It
>  * is provided "as is" without express or implied warranty.
>  *
>  * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
>  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
>  * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
>  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
>  * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
>  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
>  * PERFORMANCE OF THIS SOFTWARE.
>  */
> 
> #ifndef _DAMAGESTR_H_
> #define _DAMAGESTR_H_
> 
> #include "damage.h"
>-#include "picturestr.h"
>+#ifdef RENDER
>+# include "picturestr.h"
>+#endif
> 
> typedef struct _damage {
>     DamagePtr		pNext;
>     DamagePtr		pNextWin;
>     RegionRec		damage;
>     
>     DamageReportLevel	damageLevel;
>     Bool		isInternal;
>     void		*closure;
>     Bool		isWindow;
>     DrawablePtr		pDrawable;
>     
>     DamageReportFunc	damageReport;
>     DamageDestroyFunc	damageDestroy;
> } DamageRec;
> 
> typedef struct _damageScrPriv {
>     int				internalLevel;
> 
>     /*

Actions: View | Splinter Review

Attachments on bug 1998: 1446

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.