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

Shawn Starr shawn.starr at rogers.com
Mon Apr 18 20:57:25 PDT 2005


Prep some of the sources to include config.h for other #defines that may be 
set by the autotools.

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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.x.org/archives/xorg-modular/attachments/20050418/ea4a673e/attachment.pgp


More information about the xorg-modular mailing list