[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog server/shm.cpp
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash ./ChangeLog server/shm.cpp |
Date: |
Fri, 17 Feb 2006 16:13:33 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/02/17 16:13:33
Modified files:
. : ChangeLog
server : shm.cpp
Log message:
* server/shm.cpp (closeMem): Use shmctl(), not shm_unlink to
remove a shared memory segment on BSD machines.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.148&tr2=1.149&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/shm.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.148 gnash/ChangeLog:1.149
--- gnash/ChangeLog:1.148 Wed Feb 15 23:36:53 2006
+++ gnash/ChangeLog Fri Feb 17 16:13:32 2006
@@ -1,3 +1,8 @@
+2006-02-17 Rob Savoye <address@hidden>
+
+ * server/shm.cpp (closeMem): Use shmctl(), not shm_unlink to
+ remove a shared memory segment on BSD machines.
+
2006-02-15 Rob Savoye <address@hidden>
* config.guess: Updated to latest autoconf release.
Index: gnash/server/shm.cpp
diff -u gnash/server/shm.cpp:1.4 gnash/server/shm.cpp:1.5
--- gnash/server/shm.cpp:1.4 Wed Feb 15 23:35:53 2006
+++ gnash/server/shm.cpp Fri Feb 17 16:13:33 2006
@@ -326,6 +326,7 @@
Shm::closeMem()
{
// Only nuke the shared memory segement if we're the last one.
+#ifdef HAVE_SGM_OPEN
if (_filespec.size() != 0) {
shm_unlink(_filespec.c_str());
}
@@ -335,6 +336,9 @@
// detach memory
munmap(_addr, _size);
}
+#else
+ shmctl(_shmfd, IPC_RMID, 0);
+#endif
_addr = 0;
_alloced = 0;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog server/shm.cpp,
Rob Savoye <=