[Gnash-commit] gnash ChangeLog libbase/Makefile.am libbase/sha...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/30 22:11:50

Modified files:
        .              : ChangeLog 
        libbase        : Makefile.am sharedlib.cpp 

Log message:
                * libbase/: Makefile.am, sharedlib.cpp:
                  boost::lightweight_mutex => boost::mutex

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1836&r2=1.1837
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/sharedlib.cpp?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1836
retrieving revision 1.1837
diff -u -b -r1.1836 -r1.1837
--- ChangeLog   30 Nov 2006 21:52:37 -0000      1.1836
+++ ChangeLog   30 Nov 2006 22:11:49 -0000      1.1837
@@ -1,5 +1,7 @@
 2006-11-30 Sandro Santilli <address@hidden>
 
+       * libbase/: Makefile.am, sharedlib.cpp:
+         boost::lightweight_mutex => boost::mutex
        * backend/render_handler_agg.{cpp,h}: 
          some cleanups (including a missing virtual destructor)
          and some assertions checking, to make reproducing

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- libbase/Makefile.am 28 Nov 2006 12:10:26 -0000      1.52
+++ libbase/Makefile.am 30 Nov 2006 22:11:50 -0000      1.53
@@ -53,6 +53,7 @@
        $(OPENGL_LIBS) \
        $(PTHREAD_LIBS) \
        $(LIBLTDL) \
+       $(BOOST_LIBS) \
        $(NULL)
 
 if HAS_SDL

Index: libbase/sharedlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/sharedlib.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libbase/sharedlib.cpp       24 Nov 2006 19:25:02 -0000      1.9
+++ libbase/sharedlib.cpp       30 Nov 2006 22:11:50 -0000      1.10
@@ -14,12 +14,15 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: sharedlib.cpp,v 1.9 2006/11/24 19:25:02 nihilus Exp $ */
+/* $Id: sharedlib.cpp,v 1.10 2006/11/30 22:11:50 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "log.h"
+#include "sharedlib.h"
+
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string>
@@ -31,20 +34,18 @@
 #ifdef HAVE_LIBGEN_H
        #include <libgen.h>
 #endif
+#include <boost/thread/mutex.hpp>
 
 #if defined(_WIN32) || defined(WIN32)
-# define lock(lib_mutex) ;
-# define scoped_lock ;
+//Get boost !
+//# define lock(lib_mutex) ;
+//# define scoped_lock ;
 #      define PLUGINSDIR "./"
-#else
-# include <boost/detail/lightweight_mutex.hpp>
-  using boost::detail::lightweight_mutex;
-# define scoped_lock lightweight_mutex::scoped_lock
-  static lightweight_mutex lib_mutex;
 #endif
 
-#include "log.h"
-#include "sharedlib.h"
+typedef boost::mutex::scoped_lock scoped_lock;
+static boost::mutex lib_mutex;
+
 
 using namespace std;