Attachment 1765 Details for Bug 2398 – Patch for 2005-01-27-trunk

[patch] Patch for 2005-01-27-trunk

patch.gudiff (text/plain), 2.85 KB, created by Roland Mainz on 2005-01-27 16:47:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2005-01-27 16:47:10 UTC

Size: 2.85 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.716
>diff -u -2 -0 -r1.716 ChangeLog
>--- xc/ChangeLog	27 Jan 2005 10:22:11 -0000	1.716
>+++ xc/ChangeLog	28 Jan 2005 00:43:21 -0000
>@@ -1,20 +1,27 @@
>+2005-01-27 Roland Mainz <roland.mainz@nrubsig.org>
>+	* xc/programs/xrx/plugin/include/npapi.h
>+	Bugzilla #2398 (https://bugs.freedesktop.org/show_bug.cgi?id=2398)
>+	attachment #xxx (https://bugs.freedesktop.org/attachment.cgi?id=xxx):
>+	Fix build bustage on AIX.
>+	Patch by Dan McNichol <mcnichol@austin.ibm.com>.
>+
> 2005-01-27  Egbert Eich  <eich-at-freedesktop-dot-org>
> 
> 	* lib/Xaw/XawIm.c: (SizeNegotiation), (CreateIC), (SetICValues):
> 	Muffle gcc4 sentinel (trailing NULL in varargs list) check
> 	(Marcus Meissner, Bugzilla #2392).
> 	
> 2005-01-27  Daniel Stone  <daniel@freedesktop.org>
> 
> 	* include/extensions/scrnsaver.h:
> 	Include <X11/Xlib.h>.
> 
> 2005-01-26  Adam Jackson  <ajax@freedesktop.org>
> 
> 	* programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c:
> 	Fix tiled framebuffer setup on Savage3D (Alex Deucher)
> 
> 2005-01-26  Adam Jackson  <ajax@freedesktop.org>
> 
> 	* config/cf/xorg.cf:
> 	Disable building the Savage DRI driver.
>Index: xc/programs/xrx/plugin/include/npapi.h
>===================================================================
>RCS file: /cvs/xorg/xc/programs/xrx/plugin/include/npapi.h,v
>retrieving revision 1.2
>diff -u -2 -0 -r1.2 npapi.h
>--- xc/programs/xrx/plugin/include/npapi.h	23 Apr 2004 19:55:03 -0000	1.2
>+++ xc/programs/xrx/plugin/include/npapi.h	28 Jan 2005 00:43:40 -0000
>@@ -23,46 +23,49 @@
> 
> /*----------------------------------------------------------------------*/
> /*                   Plugin Version Constants                           */
> /*----------------------------------------------------------------------*/
> 
> #define NP_VERSION_MAJOR 0
> #define NP_VERSION_MINOR 9
> 
> 
> 
> /*----------------------------------------------------------------------*/
> /*                   Definition of Basic Types                          */
> /*----------------------------------------------------------------------*/
>  
> #ifndef _UINT16
> typedef unsigned short uint16;
> #endif
> #ifndef _UINT32
> typedef unsigned int uint32;
> #endif
>+
>+#if !(defined(_AIX) && defined(_H_INTTYPES) && defined(_ALL_SOURCE))
> #ifndef _INT16
> typedef short int16;
> #endif
> #ifndef _INT32
> typedef int int32;
> #endif
>+#endif
> 
> #ifndef FALSE
> #define FALSE (0)
> #endif
> #ifndef TRUE
> #define TRUE (1)
> #endif
> #include <stddef.h>
> 
> typedef unsigned char	NPBool;
> typedef void*			NPEvent;
> typedef int16			NPError;
> typedef int16			NPReason;
> typedef char*			NPMIMEType;
> 
> 
> 
> /*----------------------------------------------------------------------*/
> /*                   Structures and definitions                         */
> /*----------------------------------------------------------------------*/

Actions: View | Splinter Review

Attachments on bug 2398: 1765

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.