[xserver-commit] xserver/hw/xnest Args.c,1.2,1.3 Color.c,1.5,1.6 Cursor.c,1.5,1.6 Display.c,3.6,3.7 Events.c,1.4,1.5 Font.c,3.8,3.9 GC.c,3.8,3.9 GCOps.c,3.7,3.8 GetTime.c,1.1.1.2,1.2 Handlers.c,1.4,1.5 Init.c,3.26,3.27 Keyboard.c,1.11,1.12 Pixmap.c,3.9,3.10 Pointer.c,1.3,1.4 Screen.c,3.13,3.14 TestExt.c,3.5,3.6 Visual.c,1.3,1.4 Window.c,3.9,3.10 os2Stub.c,3.1,3.2
Jaymz Julian
xserver-commit@pdx.freedesktop.org
Committed by: jaymz
Update of /cvs/xserver/xserver/hw/xnest
In directory pdx:/tmp/cvs-serv20161/hw/xnest
Modified Files:
Args.c Color.c Cursor.c Display.c Events.c Font.c GC.c GCOps.c
GetTime.c Handlers.c Init.c Keyboard.c Pixmap.c Pointer.c
Screen.c TestExt.c Visual.c Window.c os2Stub.c
Log Message:
Make the xnest server honour config.h if it's available, making it not
segv on startup when built using autoconf (doesn't, unfortantly, make
it not completly useless :)
Index: Args.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Args.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Args.c 12 Oct 2003 00:21:02 -0000 1.2
+++ Args.c 4 Feb 2004 15:51:20 -0000 1.3
@@ -12,6 +12,10 @@
is" without express or implied warranty.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "screenint.h"
#include "input.h"
#include "misc.h"
Index: Color.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Color.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Color.c 2 Nov 2003 19:56:10 -0000 1.5
+++ Color.c 4 Feb 2004 15:51:20 -0000 1.6
@@ -12,6 +12,10 @@
is" without express or implied warranty.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "scrnintstr.h"
#include "window.h"
#include "windowstr.h"
Index: Cursor.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Cursor.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Cursor.c 2 Nov 2003 19:56:10 -0000 1.5
+++ Cursor.c 4 Feb 2004 15:51:20 -0000 1.6
@@ -14,6 +14,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "screenint.h"
#include "input.h"
#include "misc.h"
Index: Display.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Display.c,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -d -r3.6 -r3.7
--- Display.c 2 Nov 2003 19:56:10 -0000 3.6
+++ Display.c 4 Feb 2004 15:51:20 -0000 3.7
@@ -14,6 +14,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.4 2001/10/28 03:34:10 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "screenint.h"
#include "input.h"
#include "misc.h"
Index: Events.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Events.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Events.c 2 Nov 2003 19:56:10 -0000 1.4
+++ Events.c 4 Feb 2004 15:51:20 -0000 1.5
@@ -14,6 +14,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define NEED_EVENTS
#include "screenint.h"
#include "input.h"
Index: Font.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Font.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- Font.c 2 Nov 2003 19:56:10 -0000 3.8
+++ Font.c 4 Feb 2004 15:51:20 -0000 3.9
@@ -14,6 +14,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.6 2003/07/16 01:38:51 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <X11/Xatom.h>
#include "misc.h"
#include "regionstr.h"
Index: GC.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/GC.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- GC.c 2 Nov 2003 19:56:10 -0000 3.8
+++ GC.c 4 Feb 2004 15:51:20 -0000 3.9
@@ -14,6 +14,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.6 2001/10/28 03:34:11 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Xnest.h"
#include "gcstruct.h"
Index: GCOps.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/GCOps.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- GCOps.c 2 Nov 2003 19:56:10 -0000 3.7
+++ GCOps.c 4 Feb 2004 15:51:20 -0000 3.8
@@ -14,6 +14,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.5 2003/07/16 01:38:51 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Xnest.h"
#include "regionstr.h"
Index: GetTime.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/GetTime.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- GetTime.c 16 Jan 2001 22:43:46 -0000 1.1.1.2
+++ GetTime.c 4 Feb 2004 15:51:20 -0000 1.2
@@ -30,6 +30,10 @@
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Xos.h"
#include <time.h>
Index: Handlers.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Handlers.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Handlers.c 2 Nov 2003 19:56:10 -0000 1.4
+++ Handlers.c 4 Feb 2004 15:51:20 -0000 1.5
@@ -14,6 +14,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "screenint.h"
#include "input.h"
#include "misc.h"
Index: Init.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Init.c,v
retrieving revision 3.26
retrieving revision 3.27
diff -u -d -r3.26 -r3.27
--- Init.c 2 Nov 2003 19:56:10 -0000 3.26
+++ Init.c 4 Feb 2004 15:51:20 -0000 3.27
@@ -14,6 +14,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.24 2003/01/15 02:34:14 torrey Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "screenint.h"
#include "input.h"
#include "misc.h"
Index: Keyboard.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Keyboard.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Keyboard.c 2 Nov 2003 19:56:10 -0000 1.11
+++ Keyboard.c 4 Feb 2004 15:51:20 -0000 1.12
@@ -14,6 +14,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.9 2003/09/13 21:33:09 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define NEED_EVENTS
#include <X11/keysym.h>
#include "screenint.h"
Index: Pixmap.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Pixmap.c,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -d -r3.9 -r3.10
--- Pixmap.c 2 Nov 2003 19:56:10 -0000 3.9
+++ Pixmap.c 4 Feb 2004 15:51:20 -0000 3.10
@@ -14,6 +14,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.7 2003/07/16 01:38:51 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Xnest.h"
#include "regionstr.h"
Index: Pointer.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Pointer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Pointer.c 2 Nov 2003 19:56:10 -0000 1.3
+++ Pointer.c 4 Feb 2004 15:51:20 -0000 1.4
@@ -12,6 +12,10 @@
is" without express or implied warranty.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "screenint.h"
#include "input.h"
#include "inputstr.h"
Index: Screen.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Screen.c,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -d -r3.13 -r3.14
--- Screen.c 2 Nov 2003 19:56:10 -0000 3.13
+++ Screen.c 4 Feb 2004 15:51:20 -0000 3.14
@@ -14,6 +14,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.11 2003/01/10 13:29:40 eich Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "scrnintstr.h"
#include "dix.h"
#include "mi.h"
Index: TestExt.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/TestExt.c,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- TestExt.c 27 Aug 2001 17:41:00 -0000 3.5
+++ TestExt.c 4 Feb 2004 15:51:20 -0000 3.6
@@ -14,6 +14,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.4 2001/08/01 00:44:57 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xlib.h>
Index: Visual.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Visual.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Visual.c 2 Nov 2003 19:56:10 -0000 1.3
+++ Visual.c 4 Feb 2004 15:51:20 -0000 1.4
@@ -12,6 +12,10 @@
is" without express or implied warranty.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "scrnintstr.h"
#include "dix.h"
#include "mi.h"
Index: Window.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Window.c,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -d -r3.9 -r3.10
--- Window.c 2 Nov 2003 19:56:10 -0000 3.9
+++ Window.c 4 Feb 2004 15:51:20 -0000 3.10
@@ -14,6 +14,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.7 2001/10/28 03:34:11 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Xnest.h"
#include "gcstruct.h"
Index: os2Stub.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/os2Stub.c,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -d -r3.1 -r3.2
--- os2Stub.c 31 May 2002 18:46:04 -0000 3.1
+++ os2Stub.c 4 Feb 2004 15:51:20 -0000 3.2
@@ -32,6 +32,10 @@
/* somewhat optimized for improved performance, but assumes a few */
/* things so it cannot be used as a general select. */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define I_NEED_OS2_H
#include "Xpoll.h"
#include <stdio.h>