[Gnash-commit] gnash server/asobj/SharedObject.cpp libamf/sol....

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/12/24 18:21:03

Modified files:
        server/asobj   : SharedObject.cpp 
        libamf         : sol.cpp 
        .              : configure.ac 

Log message:
                * server/asobj/SharedObject.cpp: Include cerrno.
                * libamf/sol.cpp: Include cerrno.
                * configure.ac: Add --with-shm= option to specify whether to use
                POSIX named shared memory or the older SYSV shared memory for
                compatibility. Default is sysv. Look for the remap() function 
in libc.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SharedObject.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/sol.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.461&r2=1.462

Patches:
Index: server/asobj/SharedObject.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SharedObject.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/asobj/SharedObject.cpp       21 Dec 2007 02:57:25 -0000      1.20
+++ server/asobj/SharedObject.cpp       24 Dec 2007 18:21:03 -0000      1.21
@@ -25,6 +25,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <boost/tokenizer.hpp>
+#include <cerrno>
 
 #include "amf.h"
 #include "sol.h"

Index: libamf/sol.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/sol.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libamf/sol.cpp      20 Dec 2007 21:50:10 -0000      1.6
+++ libamf/sol.cpp      24 Dec 2007 18:21:03 -0000      1.7
@@ -20,6 +20,7 @@
 #endif
 
 #include <boost/cstdint.hpp>
+#include <cerrno>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string>

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -b -r1.461 -r1.462
--- configure.ac        18 Dec 2007 11:06:03 -0000      1.461
+++ configure.ac        24 Dec 2007 18:21:03 -0000      1.462
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.461 2007/12/18 11:06:03 strk Exp $
+dnl $Id: configure.ac,v 1.462 2007/12/24 18:21:03 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -210,6 +210,23 @@
    cross_compiling=yes
 fi
 
+AC_ARG_WITH(shm,
+  AC_HELP_STRING([--with-shm],[specify a cpu when cross compiling.]),
+  [case "${withval}" in
+    sysv) with_shm=sysv
+          ;;
+    posix) with_shm=posix
+          ;;    
+    *)   AC_MSG_ERROR([bad value ${enableval} for --with-shm option (try sysv 
or posix])
+          ;;
+   esac],with_shm=sysv)
+
+if test x"${with_shm}" = x"sysv"; then
+  AC_DEFINE([USE_SYSV_SHM], [1], [Use SYSV shared memory for compatability])
+else
+  AC_DEFINE([USE_POSIX_SHM], [1], [Use POSIX shared memory])
+fi
+
 dnl Don't add the GUI menu. Some educational systems think this adds
 dnl clutter and confusion, like on the OLPC.
 AC_ARG_ENABLE(menus,
@@ -1100,7 +1117,9 @@
        ])
 AC_LANG_POP(C++)
 
-dnl AC_CHECK_LIB(c, mremap)
+dnl Shm::resize() uses this if it exists
+AC_CHECK_LIB(c, mremap)
+
 GNASH_PKG_FIND(z, [zlib.h], [zlib compression library], compress)
 GNASH_PKG_FIND(jpeg, [jpeglib.h], [jpeg images], jpeg_mem_init)
 GNASH_PKG_FIND(png, [png.h], [png images], png_info_init)
@@ -1763,7 +1782,7 @@
 if test x"$media_handler" = xffmpeg -o x"$media_handler" = xmad; then
 echo "        Using SDL for sound handling"
 fi
-
+echo "        Using $with_shm mode for shared memory"
 echo ""
 echo "Configured paths for ${build} are:"