aboutsummaryrefslogtreecommitdiff
path: root/www/flashplugin-mozilla/files/patch-plugin.c
diff options
context:
space:
mode:
Diffstat (limited to 'www/flashplugin-mozilla/files/patch-plugin.c')
-rw-r--r--www/flashplugin-mozilla/files/patch-plugin.c50
1 files changed, 30 insertions, 20 deletions
diff --git a/www/flashplugin-mozilla/files/patch-plugin.c b/www/flashplugin-mozilla/files/patch-plugin.c
index a77f089cc89e..13150f221205 100644
--- a/www/flashplugin-mozilla/files/patch-plugin.c
+++ b/www/flashplugin-mozilla/files/patch-plugin.c
@@ -1,20 +1,30 @@
-*** plugin.c.old Mon Jun 12 10:24:09 2000
---- plugin.c Mon Sep 30 00:48:40 2002
-***************
-*** 193,198 ****
---- 193,207 ----
- XSync(This->dpy,False);
- XFreePixmap(This->dpy, This->canvas);
- shmdt(This->segInfo.shmaddr);
-+ #ifndef linux
-+ {
-+ struct shmid_ds buf;
-+
-+ if (shmctl(This->segInfo.shmid, IPC_RMID, &buf) < 0) {
-+ perror("shmctl");
-+ }
-+ }
-+ #endif
-
- FlashClose(This->fh);
- This->fh = 0;
+--- plugin.c.orig Wed Jan 19 19:30:52 2005
++++ plugin.c Wed Apr 20 14:10:14 2005
+@@ -194,6 +194,15 @@
+ XSync(This->dpy,False);
+ XFreePixmap(This->dpy, This->canvas);
+ shmdt(This->segInfo.shmaddr);
++#ifndef linux
++ {
++ struct shmid_ds buf;
++
++ if (shmctl(This->segInfo.shmid, IPC_RMID, &buf) < 0) {
++ perror("shmctl");
++ }
++ }
++#endif
+
+ FlashClose(This->fh);
+ This->fh = 0;
+@@ -257,10 +266,10 @@
+ static void
+ flashWakeUp(XtPointer client_data, XtIntervalId *id)
+ {
+- pthread_mutex_lock(&synchro);
+ PluginInstance* This;
+ long cmd;
+ long wakeUp;
++ pthread_mutex_lock(&synchro);
+
+ This = (PluginInstance*)client_data;
+