aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/globals.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-14 15:26:50 +0100
committermarha <marha@users.sourceforge.net>2013-01-14 15:26:50 +0100
commitc67a0f76ca34e441a817a7cdf261f496f3b3f2d6 (patch)
treec197b74a8c2f076aaa4f5506b90d6ad8e38b52b2 /libX11/src/globals.c
parent8d07c58314685d56a0586d0a437b541ea2b92a54 (diff)
parent2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 (diff)
downloadvcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.gz
vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.bz2
vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013 Conflicts: mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'libX11/src/globals.c')
-rw-r--r--libX11/src/globals.c121
1 files changed, 0 insertions, 121 deletions
diff --git a/libX11/src/globals.c b/libX11/src/globals.c
index 89e38a744..b7e49dda5 100644
--- a/libX11/src/globals.c
+++ b/libX11/src/globals.c
@@ -87,127 +87,6 @@ ZEROINIT (int, _Xdebug, 0);
ZEROINIT (Display *, _XHeadOfDisplayList, NULL);
-
-#if 0
-#ifdef STREAMSCONN
-
-
-/* The following are how the Xstream connections are used: */
-/* 1) Local connections over pseudo-tty ports. */
-/* 2) SVR4 local connections using named streams or SVR3.2 */
-/* local connections using streams. */
-/* 3) SVR4 stream pipe code. This code is proprietary and */
-/* the actual code is not included in the XC distribution. */
-/* 4) remote connections using tcp */
-/* 5) remote connections using StarLan */
-
-/*
- * descriptor block for streams connections
- */
-
-#include "Xstreams.h"
-
-char _XsTypeOfStream[100] = { 0 };
-
-extern int write();
-extern int close();
-#ifdef SVR4
-extern int _XsSetupSpStream();
-extern int _XsSetupNamedStream();
-#endif
-extern int _XsSetupLocalStream();
-extern int _XsConnectLocalClient();
-extern int _XsCallLocalServer();
-extern int _XsReadLocalStream();
-extern int _XsErrorCall();
-extern int _XsWriteLocalStream();
-extern int _XsCloseLocalStream();
-extern int _XsSetupTliStream();
-extern int _XsConnectTliClient();
-extern int _XsCallTliServer();
-extern int _XsReadTliStream();
-extern int _XsWriteTliStream();
-extern int _XsCloseTliStream();
-
-
-Xstream _XsStream[] = {
-
- {
- /* local connections using pseudo-ttys */
-
- _XsSetupLocalStream,
- _XsConnectLocalClient,
- _XsCallLocalServer,
- _XsReadLocalStream,
- _XsErrorCall,
- write,
- close,
- NULL
- },
- {
-#ifdef SVR4
- /* local connections using named streams */
-
- _XsSetupNamedStream,
-#else
- /* local connections using streams */
- _XsSetupLocalStream,
-#endif
- _XsConnectLocalClient,
- _XsCallLocalServer,
- _XsReadLocalStream,
- _XsErrorCall,
- write,
- close,
- NULL
- },
- /* Enhanced Application Compatibility Support */
- {
-#ifdef SVR4
- /* SVR4 stream pipe code */
- _XsSetupSpStream,
-#else
- _XsSetupLocalStream,
-#endif
- _XsConnectLocalClient,
- _XsCallLocalServer,
- _XsReadLocalStream,
- _XsErrorCall,
- write,
- close,
- NULL
- },
- /* End Enhanced Application Compatibility Support */
-
- {
- /* remote connections using tcp */
- _XsSetupTliStream,
- _XsConnectTliClient,
- _XsCallTliServer,
- _XsReadLocalStream,
- _XsErrorCall,
- write,
- close,
- NULL
- },
- {
- /* remote connections using StarLan */
- _XsSetupTliStream,
- _XsConnectTliClient,
- _XsCallTliServer,
- _XsReadLocalStream,
- _XsErrorCall,
- write,
- close,
- NULL
- }
-};
-
-
-#endif /* STREAMSCONN */
-#endif
-
-
#ifdef XTEST1
/*
* Stuff for input synthesis extension: