[Gnash-commit] gnash ChangeLog configure.ac utilities/dumpshm.cpp

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/22 18:40:59

Modified files:
        .              : ChangeLog configure.ac 
        utilities      : dumpshm.cpp 

Log message:
        Added checking and setting HAVE_SHM_UNLINK.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1346&r2=1.1347
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.176&r2=1.177
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/dumpshm.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1346
retrieving revision 1.1347
diff -u -b -r1.1346 -r1.1347
--- ChangeLog   22 Oct 2006 17:45:42 -0000      1.1346
+++ ChangeLog   22 Oct 2006 18:40:59 -0000      1.1347
@@ -25,6 +25,7 @@
 
        * configure.ac: Don't look for KDE if not --enable-plugin.
          Wrong amount of args to 'test'. AC_DEFINE(KLASH...).
+         Added checking and setting HAVE_SHM_UNLINK.
        * 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'.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -b -r1.176 -r1.177
--- configure.ac        22 Oct 2006 17:45:42 -0000      1.176
+++ configure.ac        22 Oct 2006 18:40:59 -0000      1.177
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.176 2006/10/22 17:45:42 bjacques Exp $
+dnl $Id: configure.ac,v 1.177 2006/10/22 18:40:59 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -374,7 +374,7 @@
 AC_CHECK_LIB(Xi, XInput_find_display)
 AC_CHECK_LIB(X11, XDisableAccessControl)
 AC_CHECK_LIB(rt, shm_unlink)
-AC_CHECK_FUNCS(shm_open)
+AC_CHECK_FUNCS(shm_open shm_unlink)
 AC_TRY_COMPILE([#include <strings.h>], [
   char *p1 = (char *)"Hello";
   char *p2 = (char *)"World";

Index: utilities/dumpshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/dumpshm.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- utilities/dumpshm.cpp       22 Oct 2006 17:05:37 -0000      1.4
+++ utilities/dumpshm.cpp       22 Oct 2006 18:40:59 -0000      1.5
@@ -36,6 +36,9 @@
 //
 //
 
+
+/* $Id: dumpshm.cpp,v 1.5 2006/10/22 18:40:59 nihilus Exp $ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -88,9 +91,9 @@
 int
 main(int argc, char *argv[])
 {
-#if defined(__OpenBSD__) || defined(__NetBSD__)
+#ifndef HAVE_SHM_UNLINK
 //Do nothing just return.
-cerr << "POSIX shm doesn't work on you OS!" << endl;
+cerr << "POSIX shm_unlink() isnn't supported by your OS!" << endl;
        return -1;
 #else
     unsigned int          i;