diff options
author | Mihai Moldovan <ionic@ionic.de> | 2016-06-01 21:57:36 +0200 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2016-06-01 21:57:36 +0200 |
commit | 3d54338330821a3e60e0f52cce2a9dd1f94f8b5c (patch) | |
tree | e1d61f5f14cf5f26f3cf7094c485a5424f0551ea /nx-X11/programs/Xserver/os/osdep.h | |
parent | c646808bcb0fe95e9794409231a9fa8b51990971 (diff) | |
parent | b2145323c189a9c68d475d387fdfac54bcb33c94 (diff) | |
download | nx-libs-3d54338330821a3e60e0f52cce2a9dd1f94f8b5c.tar.gz nx-libs-3d54338330821a3e60e0f52cce2a9dd1f94f8b5c.tar.bz2 nx-libs-3d54338330821a3e60e0f52cce2a9dd1f94f8b5c.zip |
Merge branch 'sunweaver-pr/xserver-drop-outdated-xext-extensions' into arctica-3.6.x
Attributes GH PR #106: https://github.com/ArcticaProject/nx-libs/pull/106
Diffstat (limited to 'nx-X11/programs/Xserver/os/osdep.h')
-rw-r--r-- | nx-X11/programs/Xserver/os/osdep.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h index e0c5de3a8..acf832e1c 100644 --- a/nx-X11/programs/Xserver/os/osdep.h +++ b/nx-X11/programs/Xserver/os/osdep.h @@ -143,9 +143,6 @@ typedef struct _connectionOutput { int size; unsigned char *buf; int count; -#ifdef LBX - Bool nocompress; -#endif } ConnectionOutput, *ConnectionOutputPtr; #ifdef K5AUTH @@ -158,10 +155,6 @@ typedef struct _k5_state { } k5_state; #endif -#ifdef LBX -typedef struct _LbxProxy *OsProxyPtr; -#endif - struct _osComm; #define AuthInitArgs void @@ -202,33 +195,14 @@ typedef struct _osComm { #endif CARD32 conn_time; /* timestamp if not established, else 0 */ struct _XtransConnInfo *trans_conn; /* transport connection object */ -#ifdef LBX - OsProxyPtr proxy; - ConnectionInputPtr largereq; - OsCloseFunc Close; - OsFlushFunc Flush; -#endif } OsCommRec, *OsCommPtr; -#ifdef LBX -#define FlushClient(who, oc, extraBuf, extraCount) \ - (*(oc)->Flush)(who, oc, extraBuf, extraCount) -extern int StandardFlushClient( - ClientPtr /*who*/, - OsCommPtr /*oc*/, - char* /*extraBuf*/, - int /*extraCount*/ -); -extern int LbxFlushClient(ClientPtr /*who*/, OsCommPtr /*oc*/, - char * /*extraBuf*/, int /*extraCount*/); -#else extern int FlushClient( ClientPtr /*who*/, OsCommPtr /*oc*/, char* /*extraBuf*/, int /*extraCount*/ ); -#endif extern void FreeOsBuffers( OsCommPtr /*oc*/ |