Attachment 2458 Details for Bug 3052 – [PATCH][1/1] - Xserver - XTrap prep sources for config.h inclusion

[patch] [PATCH][1/1] - Xserver - XTrap prep sources for config.h inclusion

1-Xserver-Xtrap-autootoolize.diff (text/plain), 2.68 KB, created by Shawn Starr on 2005-04-18 20:59:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shawn Starr

Created: 2005-04-18 20:59:13 UTC

Size: 2.68 KB

patch

obsolete

>diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/XTrap/xf86XTrapModule.c modular/xorg/Xserver/XTrap/xf86XTrapModule.c
>--- monolithic/xc/programs/Xserver/XTrap/xf86XTrapModule.c	2004-04-23 14:44:40.000000000 -0400
>+++ modular/xorg/Xserver/XTrap/xf86XTrapModule.c	2005-04-16 01:51:49.000000000 -0400
>@@ -2,6 +2,9 @@
> /*  This is the xf86 module code for the DEC_XTRAP extension.
>  */
> 
>+#ifdef HAVE_CONFIG_H
>+#include <config.h>
>+#endif
> #include "xf86Module.h"
> 
> #include <X11/extensions/xtrapdi.h>
>diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/XTrap/xtrapddmi.c modular/xorg/Xserver/XTrap/xtrapddmi.c
>--- monolithic/xc/programs/Xserver/XTrap/xtrapddmi.c	2004-04-23 14:44:40.000000000 -0400
>+++ modular/xorg/Xserver/XTrap/xtrapddmi.c	2005-04-16 01:56:41.000000000 -0400
>@@ -38,6 +38,9 @@ SOFTWARE.
>  *
>  */
> 
>+#ifdef HAVE_CONFIG_H
>+#include <config.h>
>+#endif
> #ifndef EXTMODULE
> #include <errno.h>
> #include <X11/Xos.h>
>diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/XTrap/xtrapdi.c modular/xorg/Xserver/XTrap/xtrapdi.c
>--- monolithic/xc/programs/Xserver/XTrap/xtrapdi.c	2004-04-23 14:44:40.000000000 -0400
>+++ modular/xorg/Xserver/XTrap/xtrapdi.c	2005-04-16 01:57:35.000000000 -0400
>@@ -49,6 +49,9 @@ CONNECTION WITH THE USE OR PERFORMANCE O
>  *  Include Files  *
>  *-----------------*/
> 
>+#ifdef HAVE_CONFIG_H
>+#include <config.h>
>+#endif
> #define NEED_REPLIES
> #define NEED_EVENTS
> #ifndef EXTMODULE
>diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/XTrap/xtrapdiswp.c modular/xorg/Xserver/XTrap/xtrapdiswp.c
>--- monolithic/xc/programs/Xserver/XTrap/xtrapdiswp.c	2004-04-23 14:44:40.000000000 -0400
>+++ modular/xorg/Xserver/XTrap/xtrapdiswp.c	2005-04-16 01:58:07.000000000 -0400
>@@ -44,7 +44,10 @@ CONNECTION WITH THE USE OR PERFORMANCE O
>  *	Robert Chesler - added client arg for X11R6 port in many spots
>  *
>  */
>-
>+
>+#ifdef HAVE_CONFIG_H
>+#include <config.h>
>+#endif
> #include <X11/X.h>
> #define NEED_REPLIES
> #define NEED_EVENTS
>diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/XTrap/xtrapditbl.c modular/xorg/Xserver/XTrap/xtrapditbl.c
>--- monolithic/xc/programs/Xserver/XTrap/xtrapditbl.c	2004-04-23 14:44:40.000000000 -0400
>+++ modular/xorg/Xserver/XTrap/xtrapditbl.c	2005-04-16 01:58:31.000000000 -0400
>@@ -31,10 +31,14 @@ SOFTWARE.
>  *      Marc Evans
>  *
>  */
>-
>+
> /*-----------------*
>  *  Include Files  *
>  *-----------------*/
>+
>+#ifdef HAVE_CONFIG_H
>+#include <config.h>
>+#endif
> #include <X11/X.h>
> #define NEED_REPLIES
> #define NEED_EVENTS

Actions: View | Splinter Review

Attachments on bug 3052: 2456 | 2457 | 2458 | 2459

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.