[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog utilities/dumpshm.cpp
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash ChangeLog utilities/dumpshm.cpp |
Date: |
Sun, 22 Oct 2006 17:05:38 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/10/22 17:05:37
Modified files:
. : ChangeLog
utilities : dumpshm.cpp
Log message:
NetBSD and OpenBSD
doesn't comply to POSIX shm, just return.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1343&r2=1.1344
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/dumpshm.cpp?cvsroot=gnash&r1=1.3&r2=1.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1343
retrieving revision 1.1344
diff -u -b -r1.1343 -r1.1344
--- ChangeLog 22 Oct 2006 16:07:02 -0000 1.1343
+++ ChangeLog 22 Oct 2006 17:05:34 -0000 1.1344
@@ -2,7 +2,8 @@
* configure.ac: Don't look for KDE if not --enable-plugin.
Wrong amount of args to 'test'. AC_DEFINE(KLASH...).
- * utilities/dumpshm.cpp: Fixed !__GNUC__ stuff.
+ * utilities/dumpshm.cpp: Fixed !__GNUC__ stuff. NetBSD and OpenBSD
+ doesn't comply to POSIX shm, just return.
* plugin/mozplugger/mozpluggerrc.patch: added -j -k and 'stream'.
2006-10-21 Rob Savoye <address@hidden>
Index: utilities/dumpshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/dumpshm.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- utilities/dumpshm.cpp 22 Oct 2006 11:27:13 -0000 1.3
+++ utilities/dumpshm.cpp 22 Oct 2006 17:05:37 -0000 1.4
@@ -54,7 +54,9 @@
}
#include <dirent.h>
#include <sys/types.h>
-#include <sys/mman.h>
+extern "C"{
+ #include <sys/mman.h>
+}
#include <iostream>
#include <iomanip>
#include <fstream>
@@ -86,6 +88,11 @@
int
main(int argc, char *argv[])
{
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+//Do nothing just return.
+cerr << "POSIX shm doesn't work on you OS!" << endl;
+ return -1;
+#else
unsigned int i;
int c;
bool dump = false;
@@ -273,6 +280,7 @@
// tmpptr[1] = reinterpret_cast<long>(memblks);
// mmptr->memBlocksSet(memblks);
}
+#endif
}
/// \brief Display the command line arguments