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 Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Fri, 25 Mar 2011 17:37:55 -0700
changeset 1097 243d7ed7a10c
parent 1088 1c99106ccbe0
child 1124 7bc7e624f965
permissions -rw-r--r--
6991718 Removal of 32-bit X servers [PSARC/2010/382]
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1088
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
     1
 
diff -Nurp -x '*~' -x '*.orig' hw/xfree86/dri/dri.c hw/xfree86/dri/dri.c
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
     2
 
--- hw/xfree86/dri/dri.c	2010-06-06 10:53:51.000000000 -0700
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
     3
 
+++ hw/xfree86/dri/dri.c	2010-09-03 16:45:27.658917271 -0700
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
     4
 
@@ -2494,7 +2494,11 @@ int drmInstallSIGIOHandler(int fd, 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 
     5
 
     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 
     6
 
     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 
     7
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
 
+#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 
     9
 
+    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 
    10
 
+#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 
    11
 
     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 
    12
 
+#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 
    13
 
 }
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
 
 int drmRemoveSIGIOHandler(int fd)
1088
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 851
diff changeset 
    16
 
@@ -2503,5 +2507,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 
    17
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
 
     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 
    19
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
 
+#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 
    21
 
+    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 
    22
 
+#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 
    23
 
     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 
    24
 
+#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 
    25
 
 }
upstream/oracle/x-cons/x-s11-update-clone