Attachment 1493 Details for Bug 830 – [FIXED_X11R68x] xpm.h diff including Changelog, patch for 2004-12-07-trunk

[patch] [FIXED_X11R68x] xpm.h diff including Changelog, patch for 2004-12-07-trunk

patch.gudiff (text/plain), 4.21 KB, created by Roland Mainz on 2004-12-07 17:15:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-12-07 17:15:20 UTC

Size: 4.21 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.581
>diff -u -2 -0 -r1.581 ChangeLog
>--- xc/ChangeLog	7 Dec 2004 23:37:37 -0000	1.581
>+++ xc/ChangeLog	8 Dec 2004 01:11:28 -0000
>@@ -1,21 +1,29 @@
> 2004-12-07 Roland Mainz <roland.mainz@nrubsig.org>
>+	* xc/extras/Xpm/lib/xpm.h
>+	Bugzilla #830 (https://bugs.freedesktop.org/show_bug.cgi?id=830):
>+	Fix libXpm header (xpm.h) to use the X11 function begin/end marker
>+	macros (_XFUNCPROTOBEGIN, _XFUNCPROTOEND) instead of homegrown
>+	(native) C++ code.
>+	Patch by Kevin DeKorte <kdekorte@yahoo.com>.
>+
>+2004-12-07 Roland Mainz <roland.mainz@nrubsig.org>
> 	* xc/include/extensions/dpms.h
> 	Bugzilla #830 (https://bugs.freedesktop.org/show_bug.cgi?id=830):
> 	Get DPMS header file (include/extensions/dpms.h) working with C++
> 	applications.
> 	Patch by Kevin DeKorte <kdekorte@yahoo.com> and Roland
> 	Mainz <roland.mainz@nrubsig.org>.
> 
> 2004-12-06  Matthieu Herrb <matthieu.herrb@laas.fr>
> 
> 	* programs/Xserver/hw/xfree86/common/Imakefile:
> 	xf86Config.c references USE_DEPRECATED_KEYBOARD_DRIVER so
> 	define it if needed when building this file
> 	* programs/Xserver/hw/xfree86/common/xf86config.c:
> 	- bug fix: pointerMsg -> keyboardMsg in auto-configuration code.
> 	- make the 'kbd' driver the default for autoconfiguration everywhere.
> 	* programs/Xserver/hw/xfree86/input/keyboard/kbd.c:
> 	Previous fix broke hardware-based autorepeat. This fix
> 	mimics the behaviour of the legacy driver by making a local
> 	copy of the autoRepeat flag. 
> 
>Index: xc/extras/Xpm/lib/xpm.h
>===================================================================
>RCS file: /cvs/xorg/xc/extras/Xpm/lib/xpm.h,v
>retrieving revision 1.2
>diff -u -2 -0 -r1.2 xpm.h
>--- xc/extras/Xpm/lib/xpm.h	23 Apr 2004 18:42:32 -0000	1.2
>+++ xc/extras/Xpm/lib/xpm.h	8 Dec 2004 01:11:39 -0000
>@@ -267,43 +267,41 @@
>  * color keys for visual type, they must fit along with the number key of
>  * each related element in xpmColorKeys[] defined in XpmI.h
>  */
> #define XPM_MONO	2
> #define XPM_GREY4	3
> #define XPM_GRAY4	3
> #define XPM_GREY 	4
> #define XPM_GRAY 	4
> #define XPM_COLOR	5
> 
> 
> /* macros for forward declarations of functions with prototypes */
> #define FUNC(f, t, p) extern t f p
> #define LFUNC(f, t, p) static t f p
> 
> 
> /*
>  * functions declarations
>  */
> 
>-#ifdef __cplusplus
>-extern "C" {
>-#endif
>+_XFUNCPROTOBEGIN
> 
> /* FOR_MSW, all ..Pixmap.. are excluded, only the ..XImage.. are used */
> /* Same for Amiga! */
> 
> #if !defined(FOR_MSW) && !defined(AMIGA)
>     FUNC(XpmCreatePixmapFromData, int, (Display *display,
> 					Drawable d,
> 					char **data,
> 					Pixmap *pixmap_return,
> 					Pixmap *shapemask_return,
> 					XpmAttributes *attributes));
> 
>     FUNC(XpmCreateDataFromPixmap, int, (Display *display,
> 					char ***data_return,
> 					Pixmap pixmap,
> 					Pixmap shapemask,
> 					XpmAttributes *attributes));
> 
>     FUNC(XpmReadFileToPixmap, int, (Display *display,
> 				    Drawable d,
>@@ -423,44 +421,41 @@
> 					  XpmInfo *info));
> 
>     FUNC(XpmCreateXpmImageFromData, int, (char **data,
> 					  XpmImage *image,
> 					  XpmInfo *info));
> 
>     FUNC(XpmCreateXpmImageFromBuffer, int, (char *buffer,
> 					    XpmImage *image,
> 					    XpmInfo *info));
> 
>     FUNC(XpmCreateBufferFromXpmImage, int, (char **buffer_return,
> 					    XpmImage *image,
> 					    XpmInfo *info));
> 
>     FUNC(XpmGetParseError, int, (char *filename,
> 				 int *linenum_return,
> 				 int *charnum_return));
> 
>     FUNC(XpmFree, void, (void *ptr));
> 
>-#ifdef __cplusplus
>-} /* for C++ V2.0 */
>-#endif
>-
>+_XFUNCPROTOEND
> 
> /* backward compatibility */
> 
> /* for version 3.0c */
> #define XpmPixmapColorError  XpmColorError
> #define XpmPixmapSuccess     XpmSuccess
> #define XpmPixmapOpenFailed  XpmOpenFailed
> #define XpmPixmapFileInvalid XpmFileInvalid
> #define XpmPixmapNoMemory    XpmNoMemory
> #define XpmPixmapColorFailed XpmColorFailed
> 
> #define XpmReadPixmapFile(dpy, d, file, pix, mask, att) \
>     XpmReadFileToPixmap(dpy, d, file, pix, mask, att)
> #define XpmWritePixmapFile(dpy, file, pix, mask, att) \
>     XpmWriteFileFromPixmap(dpy, file, pix, mask, att)
> 
> /* for version 3.0b */
> #define PixmapColorError  XpmColorError
> #define PixmapSuccess     XpmSuccess
> #define PixmapOpenFailed  XpmOpenFailed

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 830: 811 | 815 | 816 | 817 | 1492 | 1493

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.