XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

os: use internal xtrans instead of external library

Browse Source 
Now that we've got xtrans bundled in our source tree, use this one and
drop the external dependency.

Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/691
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2024-11-05 15:51:46 +01:00
committed by Enrico Weigelt
parent cd81370e9d
commit d5d19ac6f0
14 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
os/Xtransint.h
View File

@@ -76,7 +76,7 @@ from The Open Group.
# define _WILLWINSOCK_
#endif
#include "Xtrans.h"
#include "os/Xtrans.h"
#ifndef _X_UNUSED /* Defined in Xfuncproto.h in xproto >= 7.0.22 */
# define _X_UNUSED /* */

2
os/access.c
View File

@@ -87,7 +87,7 @@ SOFTWARE.
#define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h>
#include "os/Xtrans.h"
#include <X11/Xauth.h>
#include <X11/X.h>
#include <X11/Xproto.h>

4
os/connection.c
View File

@@ -70,8 +70,8 @@ SOFTWARE.
#define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h>
#include <X11/Xtrans/Xtransint.h>
#include "os/Xtrans.h"
#include "os/Xtransint.h"
#include <errno.h>
#include <signal.h>
#include <stdio.h>

2
os/io.c
View File

@@ -64,7 +64,7 @@ SOFTWARE.
#define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h>
#include "os/Xtrans.h"
#include <X11/Xmd.h>
#include <errno.h>
#if !defined(WIN32)

2
os/utils.c
View File

@@ -65,7 +65,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h>
#include "os/Xtrans.h"
#include <libgen.h>

2
os/xdmauth.c
View File

@@ -40,9 +40,9 @@ from The Open Group.
#define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h>
#include "os/auth.h"
#include "os/Xtrans.h"
#include "os.h"
#include "osdep.h"

4
os/xdmcp.c
View File

@@ -20,7 +20,7 @@
#define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h>
#include "os/Xtrans.h"
#endif
#include <X11/Xos.h>
@@ -51,7 +51,7 @@
#define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h>
#include "os/Xtrans.h"
#ifdef XDMCP
#undef REQUEST

2
os/xstrans.c
View File

@@ -5,4 +5,4 @@
#define TRANS_REOPEN
#define TRANS_SERVER
#define XSERV_t
#include <X11/Xtrans/transport.c>
#include "os/transport.c"