Mercurial Mercurial > upstream > oracle > x-cons > x-s11-update-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/signal-handler.patch
author Niveditha Rau <Niveditha.Rau@Oracle.COM>
Fri, 06 Apr 2012 21:57:14 -0700
changeset 1265 0b5cc5c013e4
parent 1124 7bc7e624f965
child 1276 52f85727ce94
permissions -rw-r--r--
7083537 Xorg 1.12 & associated module updates
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1124
7bc7e624f965 7042476 Xorg 1.10 & associated module updates [PSARC/2011/214]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1088
diff changeset 
     1
 
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
1265
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1124
diff changeset 
     2
 
index 1726960..7182ad2 100644
1124
7bc7e624f965 7042476 Xorg 1.10 & associated module updates [PSARC/2011/214]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1088
diff changeset 
     3
 
--- a/hw/xfree86/dri/dri.c
7bc7e624f965 7042476 Xorg 1.10 & associated module updates [PSARC/2011/214]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1088
diff changeset 
     4
 
+++ b/hw/xfree86/dri/dri.c
1265
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1124
diff changeset 
     5
 
@@ -2483,7 +2483,11 @@ int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *))
158
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
     6
 
     entry     = drmGetEntry(fd);
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
     7
 
     entry->f  = f;
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
     8
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
     9
 
+#if defined(__sun) && defined(__SVR4)
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    10
 
+    return 1;
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    11
 
+#else
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    12
 
     return xf86InstallSIGIOHandler(fd, drmSIGIOHandler, 0);
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    13
 
+#endif
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    14
 
 }
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    15
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    16
 
 int drmRemoveSIGIOHandler(int fd)
1265
0b5cc5c013e4 7083537 Xorg 1.12 & associated module updates
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents: 1124
diff changeset 
    17
 
@@ -2492,5 +2496,9 @@ int drmRemoveSIGIOHandler(int fd)
158
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    18
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    19
 
     entry->f = NULL;
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    20
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    21
 
+#if defined(__sun) && defined(__SVR4)
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    22
 
+    return 1;
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    23
 
+#else
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    24
 
     return xf86RemoveSIGIOHandler(fd);
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    25
 
+#endif
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    26
 
 }
upstream/oracle/x-cons/x-s11-update-clone