Xtrans.h
Alexander Gottwald
alexander.gottwald at s1999.tu-chemnitz.de
Thu Jun 9 07:38:15 PDT 2005
Hi all,
daniels had changed the xc/programs/Xserver code to use <X11/Xtrans/Xtrans.h>
instead of <X11/Xtrans.h> but the xc/lib code has not been changed yet. With
the modular work there is a strange workaround instead which installs Xtrans.h
and transport.c into include/X11/Xtrans/X11/.
Should this be changed to use X11/Xtrans/Xtrans.h too? I've a patch ready which
changes this in xc/lib and the new modular work. Other users of Xtrans.h are xfs,
lbxproxy and xrx which I'd change too.
bye
ago
--
Alexander.Gottwald at s1999.tu-chemnitz.de
http://www.gotti.org ICQ: 126018723
-------------- next part --------------
Index: lib/FS/src/fs_transport.c
===================================================================
RCS file: /cvs/xorg/lib/FS/src/fs_transport.c,v
retrieving revision 1.1
diff -u -r1.1 fs_transport.c
--- lib/FS/src/fs_transport.c 25 May 2005 22:12:21 -0000 1.1
+++ lib/FS/src/fs_transport.c 9 Jun 2005 13:50:51 -0000
@@ -25,4 +25,4 @@
#define FS_t
#define TRANS_CLIENT
-#include <X11/transport.c>
+#include <X11/Xtrans/transport.c>
Index: lib/ICE/src/icetrans.c
===================================================================
RCS file: /cvs/xorg/lib/ICE/src/icetrans.c,v
retrieving revision 1.1
diff -u -r1.1 icetrans.c
--- lib/ICE/src/icetrans.c 17 May 2005 20:52:35 -0000 1.1
+++ lib/ICE/src/icetrans.c 9 Jun 2005 13:50:51 -0000
@@ -30,4 +30,4 @@
#define TRANS_CLIENT
#define TRANS_SERVER
-#include <X11/transport.c>
+#include <X11/Xtrans/transport.c>
Index: lib/X11/src/x11_trans.c
===================================================================
RCS file: /cvs/xorg/lib/X11/src/x11_trans.c,v
retrieving revision 1.2
diff -u -r1.2 x11_trans.c
--- lib/X11/src/x11_trans.c 16 May 2005 22:35:28 -0000 1.2
+++ lib/X11/src/x11_trans.c 9 Jun 2005 13:50:51 -0000
@@ -28,5 +28,5 @@
#define X11_t
#define TRANS_CLIENT
-#include <X11/transport.c>
+#include <X11/Xtrans/transport.c>
Index: lib/X11/src/xim_trans.c
===================================================================
RCS file: /cvs/xorg/lib/X11/src/xim_trans.c,v
retrieving revision 1.2
diff -u -r1.2 xim_trans.c
--- lib/X11/src/xim_trans.c 16 May 2005 22:35:28 -0000 1.2
+++ lib/X11/src/xim_trans.c 9 Jun 2005 13:50:51 -0000
@@ -25,4 +25,4 @@
#define XIM_t
#define TRANS_CLIENT
-#include <X11/transport.c>
+#include <X11/Xtrans/transport.c>
Index: lib/xtrans/Makefile.am
===================================================================
RCS file: /cvs/xorg/lib/xtrans/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- lib/xtrans/Makefile.am 8 Jun 2005 06:24:53 -0000 1.5
+++ lib/xtrans/Makefile.am 9 Jun 2005 13:50:51 -0000
@@ -1,4 +1,4 @@
-Xtransincludedir = $(includedir)/X11/Xtrans/X11
+Xtransincludedir = $(includedir)/X11/Xtrans
Xtransinclude_HEADERS = \
Xtrans.h \
Xtrans.c \
Index: xc/lib/FS/FSOpenServ.c
===================================================================
RCS file: /cvs/xorg/xc/lib/FS/FSOpenServ.c,v
retrieving revision 1.3
diff -u -r1.3 FSOpenServ.c
--- xc/lib/FS/FSOpenServ.c 25 May 2005 21:47:56 -0000 1.3
+++ xc/lib/FS/FSOpenServ.c 9 Jun 2005 13:50:51 -0000
@@ -61,7 +61,7 @@
#endif
#include <stdio.h>
#include "FSlibint.h"
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
int _FSdebug = 0;
Index: xc/lib/FS/FSlibos.h
===================================================================
RCS file: /cvs/xorg/xc/lib/FS/FSlibos.h,v
retrieving revision 1.2
diff -u -r1.2 FSlibos.h
--- xc/lib/FS/FSlibos.h 23 Apr 2004 18:43:08 -0000 1.2
+++ xc/lib/FS/FSlibos.h 9 Jun 2005 13:50:51 -0000
@@ -267,7 +267,7 @@
#endif
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
#include <stdlib.h>
#include <string.h>
Index: xc/lib/ICE/accept.c
===================================================================
RCS file: /cvs/xorg/xc/lib/ICE/accept.c,v
retrieving revision 1.2
diff -u -r1.2 accept.c
--- xc/lib/ICE/accept.c 17 May 2005 20:53:55 -0000 1.2
+++ xc/lib/ICE/accept.c 9 Jun 2005 13:50:52 -0000
@@ -32,7 +32,7 @@
#endif
#include <X11/ICE/ICElib.h>
#include "ICElibint.h"
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
IceConn
Index: xc/lib/ICE/connect.c
===================================================================
RCS file: /cvs/xorg/xc/lib/ICE/connect.c,v
retrieving revision 1.3
diff -u -r1.3 connect.c
--- xc/lib/ICE/connect.c 17 May 2005 20:53:56 -0000 1.3
+++ xc/lib/ICE/connect.c 9 Jun 2005 13:50:52 -0000
@@ -33,7 +33,7 @@
#endif
#include <X11/ICE/ICElib.h>
#include "ICElibint.h"
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
#include "globals.h"
static XtransConnInfo ConnectToPeer();
Index: xc/lib/ICE/listen.c
===================================================================
RCS file: /cvs/xorg/xc/lib/ICE/listen.c,v
retrieving revision 1.2
diff -u -r1.2 listen.c
--- xc/lib/ICE/listen.c 17 May 2005 20:53:56 -0000 1.2
+++ xc/lib/ICE/listen.c 9 Jun 2005 13:50:52 -0000
@@ -32,7 +32,7 @@
#endif
#include <X11/ICE/ICElib.h>
#include "ICElibint.h"
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
#include <stdio.h>
Index: xc/lib/ICE/listenwk.c
===================================================================
RCS file: /cvs/xorg/xc/lib/ICE/listenwk.c,v
retrieving revision 1.3
diff -u -r1.3 listenwk.c
--- xc/lib/ICE/listenwk.c 17 May 2005 20:53:56 -0000 1.3
+++ xc/lib/ICE/listenwk.c 9 Jun 2005 13:50:52 -0000
@@ -35,7 +35,7 @@
#endif
#include <X11/ICE/ICElib.h>
#include "ICElibint.h"
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
#include <stdio.h>
Index: xc/lib/ICE/misc.c
===================================================================
RCS file: /cvs/xorg/xc/lib/ICE/misc.c,v
retrieving revision 1.4
diff -u -r1.4 misc.c
--- xc/lib/ICE/misc.c 17 May 2005 20:53:56 -0000 1.4
+++ xc/lib/ICE/misc.c 9 Jun 2005 13:50:52 -0000
@@ -36,7 +36,7 @@
#endif
#include <X11/ICE/ICElib.h>
#include "ICElibint.h"
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
#include <stdio.h>
#ifdef WIN32
#include <X11/Xwinsock.h>
Index: xc/lib/ICE/shutdown.c
===================================================================
RCS file: /cvs/xorg/xc/lib/ICE/shutdown.c,v
retrieving revision 1.3
diff -u -r1.3 shutdown.c
--- xc/lib/ICE/shutdown.c 17 May 2005 20:53:57 -0000 1.3
+++ xc/lib/ICE/shutdown.c 9 Jun 2005 13:50:52 -0000
@@ -33,7 +33,7 @@
#endif
#include <X11/ICE/ICElib.h>
#include "ICElibint.h"
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
Status
Index: xc/lib/SM/sm_manager.c
===================================================================
RCS file: /cvs/xorg/xc/lib/SM/sm_manager.c,v
retrieving revision 1.6
diff -u -r1.6 sm_manager.c
--- xc/lib/SM/sm_manager.c 17 May 2005 21:25:16 -0000 1.6
+++ xc/lib/SM/sm_manager.c 9 Jun 2005 13:50:52 -0000
@@ -35,7 +35,7 @@
#endif
#include <X11/SM/SMlib.h>
#include "SMlibint.h"
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
#ifdef __USLC__
#undef shutdown
Index: xc/lib/X11/ClDisplay.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/ClDisplay.c,v
retrieving revision 1.3
diff -u -r1.3 ClDisplay.c
--- xc/lib/X11/ClDisplay.c 13 May 2005 22:53:43 -0000 1.3
+++ xc/lib/X11/ClDisplay.c 9 Jun 2005 13:50:52 -0000
@@ -32,7 +32,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
#include "Xlib.h"
#include "Xlibint.h"
#include "Xintconn.h"
Index: xc/lib/X11/ConnDis.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/ConnDis.c,v
retrieving revision 1.8
diff -u -r1.8 ConnDis.c
--- xc/lib/X11/ConnDis.c 4 Jun 2005 21:20:20 -0000 1.8
+++ xc/lib/X11/ConnDis.c 9 Jun 2005 13:50:52 -0000
@@ -37,7 +37,7 @@
#include <config.h>
#endif
#include <X11/Xlibint.h>
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
#include <X11/Xauth.h>
#include <X11/Xdmcp.h>
#include <stdio.h>
Index: xc/lib/X11/OpenDis.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/OpenDis.c,v
retrieving revision 1.5
diff -u -r1.5 OpenDis.c
--- xc/lib/X11/OpenDis.c 13 May 2005 22:53:44 -0000 1.5
+++ xc/lib/X11/OpenDis.c 9 Jun 2005 13:50:52 -0000
@@ -32,7 +32,7 @@
#include <config.h>
#endif
#include "Xlibint.h"
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
#include <X11/Xatom.h>
#include <X11/Xresource.h>
#include "bigreqstr.h"
Index: xc/lib/X11/XlibInt.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/XlibInt.c,v
retrieving revision 1.6
diff -u -r1.6 XlibInt.c
--- xc/lib/X11/XlibInt.c 13 May 2005 22:53:44 -0000 1.6
+++ xc/lib/X11/XlibInt.c 9 Jun 2005 13:50:55 -0000
@@ -43,7 +43,7 @@
#endif
#include "Xlibint.h"
#include <X11/Xpoll.h>
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
#include <X11/extensions/xcmiscstr.h>
#include <stdio.h>
#ifdef WIN32
Index: xc/lib/X11/imTrans.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/imTrans.c,v
retrieving revision 1.4
diff -u -r1.4 imTrans.c
--- xc/lib/X11/imTrans.c 13 May 2005 22:53:44 -0000 1.4
+++ xc/lib/X11/imTrans.c 9 Jun 2005 13:50:55 -0000
@@ -38,7 +38,7 @@
#include <X11/Xmd.h>
#define NEED_EVENTS
#include "Xlibint.h"
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
#include "Xlcint.h"
#include "Ximint.h"
#include "XimTrans.h"
Index: xc/lib/font/fc/fsconvert.c
===================================================================
RCS file: /cvs/xorg/xc/lib/font/fc/fsconvert.c,v
retrieving revision 1.3
diff -u -r1.3 fsconvert.c
--- xc/lib/font/fc/fsconvert.c 27 May 2005 17:44:07 -0000 1.3
+++ xc/lib/font/fc/fsconvert.c 9 Jun 2005 13:50:56 -0000
@@ -28,7 +28,7 @@
*/
#include <X11/X.h>
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
#include <X11/Xpoll.h>
#include <X11/fonts/FS.h>
#include <X11/fonts/FSproto.h>
Index: xc/lib/font/fc/fserve.c
===================================================================
RCS file: /cvs/xorg/xc/lib/font/fc/fserve.c,v
retrieving revision 1.3
diff -u -r1.3 fserve.c
--- xc/lib/font/fc/fserve.c 27 May 2005 17:44:07 -0000 1.3
+++ xc/lib/font/fc/fserve.c 9 Jun 2005 13:50:56 -0000
@@ -56,7 +56,7 @@
#ifdef WIN32
#define _WILLWINSOCK_
#endif
-#include "X11/Xtrans.h"
+#include "X11/Xtrans/Xtrans.h"
#include "X11/Xpoll.h"
#include <X11/fonts/FS.h>
#include <X11/fonts/FSproto.h>
Index: xc/lib/font/fc/fsio.c
===================================================================
RCS file: /cvs/xorg/xc/lib/font/fc/fsio.c,v
retrieving revision 1.4
diff -u -r1.4 fsio.c
--- xc/lib/font/fc/fsio.c 27 May 2005 17:44:07 -0000 1.4
+++ xc/lib/font/fc/fsio.c 9 Jun 2005 13:50:56 -0000
@@ -33,7 +33,7 @@
#include "X11/Xwindows.h"
#endif
-#include "X11/Xtrans.h"
+#include "X11/Xtrans/Xtrans.h"
#include "X11/Xpoll.h"
#include <X11/fonts/FS.h>
#include <X11/fonts/FSproto.h>
Index: xc/lib/font/fc/fslibos.h
===================================================================
RCS file: /cvs/xorg/xc/lib/font/fc/fslibos.h,v
retrieving revision 1.2
diff -u -r1.2 fslibos.h
--- xc/lib/font/fc/fslibos.h 23 Apr 2004 18:44:21 -0000 1.2
+++ xc/lib/font/fc/fslibos.h 9 Jun 2005 13:50:56 -0000
@@ -37,7 +37,7 @@
* FSlib networking & os include file
*/
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
#ifndef WIN32
Index: xc/lib/xtrans/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/xtrans/Imakefile,v
retrieving revision 1.3
diff -u -r1.3 Imakefile
--- xc/lib/xtrans/Imakefile 20 Apr 2005 16:27:10 -0000 1.3
+++ xc/lib/xtrans/Imakefile 9 Jun 2005 13:50:56 -0000
@@ -8,4 +8,3 @@
DependTarget()
BuildIncludes(Xtrans.h,IncSubdir/Xtrans,../..)
-BuildIncludes(Xtrans.h,IncSubdir,..)
More information about the xorg
mailing list