debrix/os Imakefile, 1.2, 1.3 WaitFor.c, 1.2, 1.3 access.c, 1.2, 1.3 auth.c, 1.2, 1.3 connection.c, 1.2, 1.3 genalloca.c, 1.2, 1.3 hpsocket.c, 1.1.1.1, 1.2 io.c, 1.2, 1.3 k5auth.c, 1.2, 1.3 lbxio.c, 1.2, 1.3 log.c, 1.1.1.1, 1.2 mitauth.c, 1.2, 1.3 oscolor.c, 1.2, 1.3 osdep.h, 1.2, 1.3 osinit.c, 1.2, 1.3 rpcauth.c, 1.2, 1.3 secauth.c, 1.2, 1.3 utils.c, 1.2, 1.3 xalloc.c, 1.2, 1.3 xdmauth.c, 1.2, 1.3 xdmcp.c, 1.2, 1.3

Daniel Stone xserver-commit at pdx.freedesktop.org
Fri Jun 11 05:42:02 EST 2004 

Committed by: daniel

Update of /cvs/xserver/debrix/os
In directory pdx:/home/daniel/x/debrix/debrix/os

Modified Files:
	Imakefile WaitFor.c access.c auth.c connection.c genalloca.c 
	hpsocket.c io.c k5auth.c lbxio.c log.c mitauth.c oscolor.c 
	osdep.h osinit.c rpcauth.c secauth.c utils.c xalloc.c 
	xdmauth.c xdmcp.c 
Log Message:
Initial import from modular sources.


Index: Imakefile
===================================================================
RCS file: /cvs/xserver/debrix/os/Imakefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Imakefile	23 Apr 2004 19:54:28 -0000	1.2
+++ Imakefile	10 Jun 2004 19:41:59 -0000	1.3
@@ -5,6 +5,9 @@
 
 XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.40 2003/09/09 03:20:41 dawes Exp $
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <Server.tmpl>
 
 /*

Index: WaitFor.c
===================================================================
RCS file: /cvs/xserver/debrix/os/WaitFor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- WaitFor.c	23 Apr 2004 19:54:28 -0000	1.2
+++ WaitFor.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -56,13 +56,16 @@
  *
  *****************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #endif
-#include "Xos.h"			/* for strings, fcntl, time */
+#include <X11/Xos.h>			/* for strings, fcntl, time */
 #include <errno.h>
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 
 #ifdef __UNIXOS2__
@@ -94,7 +97,7 @@
 
 #ifdef DPMSExtension
 #define DPMS_SERVER
-#include "dpms.h"
+#include <X11/extensions/dpms.h>
 #endif
 
 #ifdef XTESTEXT1

Index: access.c
===================================================================
RCS file: /cvs/xserver/debrix/os/access.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- access.c	23 Apr 2004 19:54:28 -0000	1.2
+++ access.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -57,16 +57,19 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/os/access.c,v 3.53 2004/01/02 18:23:19 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
 #include <X11/Xauth.h>
-#include <X.h>
-#include <Xproto.h>
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "site.h"
 #include <errno.h>

Index: auth.c
===================================================================
RCS file: /cvs/xserver/debrix/os/auth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- auth.c	23 Apr 2004 19:54:28 -0000	1.2
+++ auth.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -33,6 +33,9 @@
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef K5AUTH
 # include   <krb5/krb5.h>
 #endif

Index: connection.c
===================================================================
RCS file: /cvs/xserver/debrix/os/connection.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- connection.c	23 Apr 2004 19:54:28 -0000	1.2
+++ connection.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -63,12 +63,15 @@
  *
  *****************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #endif
-#include "X.h"
-#include "Xproto.h"
-#include <X11/Xtrans.h>
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xtrans/Xtrans.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>

Index: genalloca.c
===================================================================
RCS file: /cvs/xserver/debrix/os/genalloca.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- genalloca.c	23 Apr 2004 19:54:28 -0000	1.2
+++ genalloca.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -24,6 +24,9 @@
 */
 /* $XFree86$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef lint
 static char	SCCSid[] = "@(#)alloca.c	1.1";	/* for the "what" utility */
 #endif

Index: hpsocket.c
===================================================================
RCS file: /cvs/xserver/debrix/os/hpsocket.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- hpsocket.c	14 Nov 2003 16:48:57 -0000	1.1.1.1
+++ hpsocket.c	10 Jun 2004 19:41:59 -0000	1.2
@@ -31,6 +31,9 @@
  * special socket routine for hp
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 

Index: io.c
===================================================================
RCS file: /cvs/xserver/debrix/os/io.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- io.c	23 Apr 2004 19:54:28 -0000	1.2
+++ io.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -55,6 +55,9 @@
  *****************************************************************/
 /* $XFree86: xc/programs/Xserver/os/io.c,v 3.34 2002/05/31 18:46:05 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if 0
 #define DEBUG_COMMUNICATION
 #endif
@@ -62,8 +65,8 @@
 #include <X11/Xwinsock.h>
 #endif
 #include <stdio.h>
-#include <X11/Xtrans.h>
-#include "Xmd.h"
+#include <X11/Xtrans/Xtrans.h>
+#include <X11/Xmd.h>
 #include <errno.h>
 #if !defined(__UNIXOS2__) && !defined(WIN32)
 #ifndef Lynx
@@ -72,19 +75,19 @@
 #include <uio.h>
 #endif
 #endif
-#include "X.h"
+#include <X11/X.h>
 #define NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "os.h"
 #include "osdep.h"
-#include "Xpoll.h"
+#include <X11/Xpoll.h>
 #include "opaque.h"
 #include "dixstruct.h"
 #include "misc.h"
 #ifdef LBX
 #include "colormapst.h"
 #include "propertyst.h"
-#include "lbxserve.h"
+#include <X11/extensions/lbxserve.h>
 #endif
 
 CallbackListPtr       ReplyCallback;
@@ -117,7 +120,7 @@
 			      lswaps((req)->length) : (req)->length)
 
 #ifdef BIGREQS
-#include "bigreqstr.h"
+#include <X11/extensions/bigreqstr.h>
 
 #define get_big_req_len(req,cli) ((cli)->swapped ? \
 				  lswapl(((xBigReq *)(req))->length) : \

Index: k5auth.c
===================================================================
RCS file: /cvs/xserver/debrix/os/k5auth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- k5auth.c	23 Apr 2004 19:54:28 -0000	1.2
+++ k5auth.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -36,6 +36,9 @@
  * krb5 distribution. (At least the checking part)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #ifdef TCPCONN
@@ -50,11 +53,11 @@
 #undef BITS32
 #undef xfree
 #include <krb5/los-proto.h>
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "osdep.h"
-#include "Xproto.h"
-#include "Xfuncs.h"
+#include <X11/Xproto.h>
+#include <X11/Xfuncs.h>
 #include "dixstruct.h"
 #include <com_err.h>
 #include "Xauth.h"

Index: lbxio.c
===================================================================
RCS file: /cvs/xserver/debrix/os/lbxio.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lbxio.c	23 Apr 2004 19:54:28 -0000	1.2
+++ lbxio.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -49,9 +49,12 @@
 ******************************************************************/
 /* $Xorg: lbxio.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
-#include <X11/Xtrans.h>
-#include "Xmd.h"
+#include <X11/Xtrans/Xtrans.h>
+#include <X11/Xmd.h>
 #include <errno.h>
 #ifndef Lynx
 #include <sys/param.h>
@@ -61,8 +64,8 @@
 #else
 #include <uio.h>
 #endif
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "os.h"
 #include "Xpoll.h"
 #include "osdep.h"

Index: log.c
===================================================================
RCS file: /cvs/xserver/debrix/os/log.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- log.c	25 Nov 2003 19:29:01 -0000	1.1.1.1
+++ log.c	10 Jun 2004 19:41:59 -0000	1.2
@@ -78,7 +78,10 @@
 
 /* $XFree86: xc/programs/Xserver/os/log.c,v 1.6 2003/11/07 13:45:27 tsi Exp $ */
 
-#include "Xos.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xos.h>
 #include <stdio.h>
 #include <time.h>
 #include <sys/stat.h>

Index: mitauth.c
===================================================================
RCS file: /cvs/xserver/debrix/os/mitauth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mitauth.c	23 Apr 2004 19:54:28 -0000	1.2
+++ mitauth.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -33,7 +33,10 @@
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "os.h"
 #include "osdep.h"
 #include "dixstruct.h"

Index: oscolor.c
===================================================================
RCS file: /cvs/xserver/debrix/os/oscolor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- oscolor.c	23 Apr 2004 19:54:28 -0000	1.2
+++ oscolor.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $Xorg: oscolor.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef USE_RGB_TXT
 
 #ifdef NDBM

Index: osdep.h
===================================================================
RCS file: /cvs/xserver/debrix/os/osdep.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- osdep.h	23 Apr 2004 19:54:28 -0000	1.2
+++ osdep.h	10 Jun 2004 19:41:59 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $Xorg: osdep.h,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _OSDEP_H_
 #define _OSDEP_H_ 1
 

Index: osinit.c
===================================================================
RCS file: /cvs/xserver/debrix/os/osinit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- osinit.c	23 Apr 2004 19:54:28 -0000	1.2
+++ osinit.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -47,11 +47,14 @@
 ******************************************************************/
 /* $Xorg: osinit.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "osdep.h"
-#include "Xos.h"
+#include <X11/Xos.h>
 
 #ifdef SMART_SCHEDULE
 #include "dixstruct.h"

Index: rpcauth.c
===================================================================
RCS file: /cvs/xserver/debrix/os/rpcauth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rpcauth.c	23 Apr 2004 19:54:28 -0000	1.2
+++ rpcauth.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -34,9 +34,12 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef SECURE_RPC
 
-#include "X.h"
+#include <X11/X.h>
 #include "Xauth.h"
 #include "misc.h"
 #include "os.h"

Index: secauth.c
===================================================================
RCS file: /cvs/xserver/debrix/os/secauth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- secauth.c	23 Apr 2004 19:54:28 -0000	1.2
+++ secauth.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -26,7 +26,10 @@
 */
 /* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.10 2001/08/01 00:44:59 tsi Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "os.h"
 #include "osdep.h"
 #include "dixstruct.h"

Index: utils.c
===================================================================
RCS file: /cvs/xserver/debrix/os/utils.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- utils.c	23 Apr 2004 19:54:28 -0000	1.2
+++ utils.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -52,6 +52,9 @@
 */
 /* $XFree86: xc/programs/Xserver/os/utils.c,v 3.96 2004/01/07 04:16:37 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef __CYGWIN__
 #include <stdlib.h>
 #include <signal.h>
@@ -60,11 +63,11 @@
 #if defined(WIN32) && !defined(__CYGWIN__)
 #include <X11/Xwinsock.h>
 #endif
-#include "Xos.h"
+#include <X11/Xos.h>
 #include <stdio.h>
 #include "misc.h"
-#include "X.h"
-#include <X11/Xtrans.h>
+#include <X11/X.h>
+#include <X11/Xtrans/Xtrans.h>
 #include "input.h"
 #include "dixfont.h"
 #include "osdep.h"
@@ -110,7 +113,7 @@
 #endif
 
 #ifdef XKB
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER

Index: xalloc.c
===================================================================
RCS file: /cvs/xserver/debrix/os/xalloc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xalloc.c	23 Apr 2004 19:54:28 -0000	1.2
+++ xalloc.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define FATALERRORS 1
 /*
 Copyright (C) 1995 Pascal Haible.  All Rights Reserved.
@@ -35,9 +38,9 @@
 
 #include <stdlib.h>	/* for malloc() etc. */
 
-#include "Xos.h"
+#include <X11/Xos.h>
 #include "misc.h"
-#include "X.h"
+#include <X11/X.h>
 
 #ifdef XALLOC_LOG
 #include <stdio.h>

Index: xdmauth.c
===================================================================
RCS file: /cvs/xserver/debrix/os/xdmauth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xdmauth.c	23 Apr 2004 19:54:28 -0000	1.2
+++ xdmauth.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -35,8 +35,11 @@
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #include "Xtrans.h"
 #include "os.h"
 #include "osdep.h"
@@ -47,7 +50,7 @@
 static Bool authFromXDMCP;
 
 #ifdef XDMCP
-#include "Xmd.h"
+#include <X11/Xmd.h>
 #undef REQUEST
 #include "Xdmcp.h"
 

Index: xdmcp.c
===================================================================
RCS file: /cvs/xserver/debrix/os/xdmcp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xdmcp.c	23 Apr 2004 19:54:28 -0000	1.2
+++ xdmcp.c	10 Jun 2004 19:41:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.1.4.5 2004/02/23 21:37:27 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.1.4.5.2.2 2004/03/04 17:48:31 eich Exp $ */
 /* $Xorg: xdmcp.c,v 1.4 2001/01/31 13:37:19 pookie Exp $ */
 /*
  * Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
@@ -16,6 +16,9 @@
  */
 /* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.31 2003/12/30 21:24:32 herrb Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef WIN32
 /* avoid conflicting definitions */
 #define BOOL wBOOL
@@ -30,7 +33,7 @@
 #undef RT_CURSOR
 #endif
 
-#include "Xos.h"
+#include <X11/Xos.h>
 
 #if !defined(WIN32)
 #ifndef Lynx
@@ -45,10 +48,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "misc.h"
-#include "Xpoll.h"
+#include <X11/Xpoll.h>
 #include "osdep.h"
 #include "input.h"
 #include "dixstruct.h"

More information about the xserver-commit mailing list