Mercurial Mercurial > upstream > oracle > x-cons > x-s12-clone / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open-src/xserver/xorg/17385060.patch
author Niveditha Rau <Niveditha.Rau@Oracle.COM>
Tue, 03 Sep 2013 15:33:12 -0700
changeset 1405 005591bfa13c
permissions -rw-r--r--
17385060 Xvnc is missing the SUN_TSOL extension
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1405
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     1
 
--- a/mi/miinitext.c	Fri Aug 30 09:09:00 2013
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     2
 
+++ b/mi/miinitext.c	Fri Aug 30 10:10:51 2013
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     3
 
@@ -317,6 +317,12 @@
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     4
 
 #ifdef RES
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     5
 
     {ResExtensionInit, XRES_NAME, &noResExtension},
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     6
 
 #endif
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     7
 
+#if defined(SolarisIAExtension) && !defined(XORGSERVER)
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     8
 
+    {IAExtensionInit, IANAME, &noIAExtension},
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     9
 
+#endif
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    10
 
+#if defined(TSOL) && !defined(XORGSERVER)
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    11
 
+    {TsolExtensionInit, TSOLNAME, &noXTSolExtension},
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    12
 
+#endif
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    13
 
 #ifdef XV
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    14
 
     {XvExtensionInit, XvName, &noXvExtension},
005591bfa13c 17385060 Xvnc is missing the SUN_TSOL extension
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    15
 
     {XvMCExtensionInit, XvMCName, &noXvExtension},
upstream/oracle/x-cons/x-s12-clone