[Gnash-commit] /srv/bzr/gnash/trunk r10840: Applied patch from Andrea Palmatè

[Markus Gothe]

------------------------------------------------------------
revno: 10840
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Sun 2009-04-26 14:12:42 +0200
message:
  Applied patch from Andrea Palmatè
modified:
  utilities/dumpshm.cpp
  utilities/flvdumper.cpp
  utilities/processor.cpp
  utilities/soldumper.cpp

=== modified file 'utilities/dumpshm.cpp'
--- a/utilities/dumpshm.cpp     2009-02-25 22:33:03 +0000
+++ b/utilities/dumpshm.cpp     2009-04-26 12:12:42 +0000
@@ -37,11 +37,11 @@
 }
 #include <dirent.h>
 #include <sys/types.h>
-#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__)
+#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__) && 
!defined(__amigaos4__)
 #include <sys/mman.h>
 #include <sys/shm.h>
 #include <sys/ipc.h>
-#elif !defined(__riscos__) && !defined(__OS2__)
+#elif !defined(__riscos__) && !defined(__OS2__) && !defined(__amigaos4__)
 #include <windows.h>
 #include <process.h>
 #include <io.h>
@@ -73,6 +73,17 @@
 using namespace std;
 using namespace gnash;
 
+#ifdef BOOST_NO_EXCEPTIONS
+namespace boost
+{
+
+       void throw_exception(std::exception const & e)
+       {
+               std::abort();
+       }
+}
+#endif
+
 // #error "No supported shared memory type for this platform"
 
 static void usage (void);

=== modified file 'utilities/flvdumper.cpp'
--- a/utilities/flvdumper.cpp   2009-04-23 14:46:54 +0000
+++ b/utilities/flvdumper.cpp   2009-04-26 12:12:42 +0000
@@ -50,6 +50,17 @@
 gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
 }
 
+#ifdef BOOST_NO_EXCEPTIONS
+namespace boost
+{
+
+       void throw_exception(std::exception const & e)
+       {
+               std::abort();
+       }
+}
+#endif
+
 static void usage ();
 
 static const char *codec_strs[] = {

=== modified file 'utilities/processor.cpp'
--- a/utilities/processor.cpp   2009-04-23 14:46:54 +0000
+++ b/utilities/processor.cpp   2009-04-26 12:12:42 +0000
@@ -69,6 +69,17 @@
 #endif
 }
 
+#ifdef BOOST_NO_EXCEPTIONS
+
+namespace boost
+{
+       void throw_exception(std::exception const & e)
+       {
+               std::abort();
+       }
+}
+#endif
+
 // How many seconds to wait for a frame advancement 
 // before kicking the movie (forcing it to next frame)
 static const double waitforadvance = 5;

=== modified file 'utilities/soldumper.cpp'
--- a/utilities/soldumper.cpp   2009-04-23 14:46:54 +0000
+++ b/utilities/soldumper.cpp   2009-04-26 12:12:42 +0000
@@ -51,6 +51,17 @@
 gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
 }
 
+#ifdef BOOST_NO_EXCEPTIONS
+namespace boost
+{
+
+       void throw_exception(std::exception const & e)
+       {
+               std::abort();
+       }
+}
+#endif
+
 const char *SOLDUMPER_VERSION = "0.5";
 static void usage ();