diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 10:16:00 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 10:16:00 +0200 |
| commit | d14cc5361f7db7016b7cbb1cc59d8500101d9f27 (patch) | |
| tree | 28bb620b5a39a9f649393e5ad113b07089fafe2b /doc/nx-X11_vs_XOrg69_patches/nx-X11_config_cf_sun.cf.X.original | |
| parent | 74a52dd354cc638c9f5fdedb0606b3b69e2b488a (diff) | |
| download | nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.tar.gz nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.tar.bz2 nx-libs-d14cc5361f7db7016b7cbb1cc59d8500101d9f27.zip | |
doc/_attic_/: Introduce an "_attic_" folder. Move diffs between NoMachine's nx-X11 3.5 and X.org 6.9 here.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/nx-X11_config_cf_sun.cf.X.original')
| -rw-r--r-- | doc/nx-X11_vs_XOrg69_patches/nx-X11_config_cf_sun.cf.X.original | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_config_cf_sun.cf.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_config_cf_sun.cf.X.original deleted file mode 100644 index 444c142be..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/nx-X11_config_cf_sun.cf.X.original +++ /dev/null @@ -1,50 +0,0 @@ ---- ./nx-X11/config/cf/sun.cf.X.original 2015-02-13 14:03:44.400448260 +0100 -+++ ./nx-X11/config/cf/sun.cf 2015-02-13 14:03:44.400448260 +0100 -@@ -299,7 +299,12 @@ - - #if OSMajorVersion == 4 - # if OSMinorVersion == 1 -+/* -+ * Currently the NX transport only works with select(). -+ * - # define HasPoll YES -+ */ -+# define HasPoll NO - # endif - # if OSMinorVersion > 1 || (OSMinorVersion == 1 && OSTeenyVersion > 1) - /* You ALSO need this if you have Sun ld patch 100170-06 or later to 4.1.1 */ -@@ -359,10 +364,12 @@ - # endif - #endif - --#define ServerOSDefines XFree86ServerOSDefines IncludeCG2HeaderDefine -+#define ServerOSDefines XFree86ServerOSDefines IncludeCG2HeaderDefine \ -+ -DPIXPRIV - #define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines \ - CompilerServerExtraDefines \ -- OSServerExtraDefines ArchServerExtraDefines -+ OSServerExtraDefines ArchServerExtraDefines \ -+ -DPIXPRIV - - #ifndef HasPerl - /* Solaris 8 comes with perl. Earlier versions don't. */ -@@ -384,7 +391,8 @@ - #endif - - #if OSMajorVersion > 4 --# define ConnectionFlags -DTCPCONN -DUNIXCONN -DLOCALCONN -+/* #define ConnectionFlags -DTCPCONN -DUNIXCONN -DLOCALCONN */ -+#define ConnectionFlags -DUNIXCONN -DTCPCONN - # if HasSunC - # ifdef DefaultSunProCCompilerDir - # ifndef CcCmd -@@ -452,7 +460,8 @@ - # endif - # define ToolkitStringsABIOptions -intelabi SolarisABIFlag - # else --# define StandardDefines -Dsun -Dsparc -DSVR4 -D__EXTENSIONS__ LargefileDefines -+# define StandardDefines -Dsun -Dsparc -DSVR4 -D__EXTENSIONS__ LargefileDefines \ -+ -DPIXPRIV - # define ToolkitStringsABIOptions -sparcabi SolarisABIFlag - # endif - # define ExtraLibraries -lsocket -lnsl |