[Gnash-commit] gnash/libbase extension.cpp sharedlib.cpp

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/11/24 14:41:39

Modified files:
        libbase        : extension.cpp sharedlib.cpp 

Log message:
                * libbase\sharelib.cpp: fixed VC++ compiler errors
                * libbase\extension.cpp: fixed VC++ compiler errors
                * libltdl\ltdl.c: fixed VC++ compiler errors

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/extension.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/sharedlib.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: extension.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/extension.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- extension.cpp       24 Nov 2006 04:45:05 -0000      1.1
+++ extension.cpp       24 Nov 2006 14:41:39 -0000      1.2
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: extension.cpp,v 1.1 2006/11/24 04:45:05 rsavoye Exp $ */
+/* $Id: extension.cpp,v 1.2 2006/11/24 14:41:39 alexeev Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -22,7 +22,11 @@
 
 #if defined(_WIN32) || defined(WIN32)
 # define lock(lib_mutex);
-# define scoped_lock;
+# define scoped_lock ;
+#define PLUGINSDIR "./"        //hack
+#define USE_DIRENT 1
+
+
 #else
 # include <boost/detail/lightweight_mutex.hpp>
   using boost::detail::lightweight_mutex;
@@ -39,7 +43,7 @@
 #include "extension.h"
 #include "as_object.h"
 
-#if HAVE_DIRENT_H
+#if HAVE_DIRENT_H || WIN32==1  // win32 hack
 # include <dirent.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)
 #else
@@ -123,6 +127,7 @@
         SharedLib sl;
         initModule(mod.c_str(), obj);
     }    
+               return true;
 }
 
 bool
@@ -162,6 +167,7 @@
 {
     GNASH_REPORT_FUNCTION;
     scanDir(_pluginsdir);
+               return true;
 }
 
 bool
@@ -223,6 +229,7 @@
         }
         dir = strtok(NULL, ":");
     }
+       return true;
 }
 
 void

Index: sharedlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/sharedlib.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- sharedlib.cpp       24 Nov 2006 04:45:05 -0000      1.5
+++ sharedlib.cpp       24 Nov 2006 14:41:39 -0000      1.6
@@ -14,7 +14,7 @@
 // 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.5 2006/11/24 04:45:05 rsavoye Exp $ */
+/* $Id: sharedlib.cpp,v 1.6 2006/11/24 14:41:39 alexeev Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -32,6 +32,7 @@
 #if defined(_WIN32) || defined(WIN32)
 # define lock(lib_mutex) ;
 # define scoped_lock ;
+#      define PLUGINSDIR "./"
 #else
 # include <boost/detail/lightweight_mutex.hpp>
   using boost::detail::lightweight_mutex;
@@ -200,13 +201,17 @@
 const char *
 SharedLib::moduleName()
 {
+#ifdef WIN32
+       return NULL;    //TODO, hack
+#else
     return basename(_filespec);
+#endif
 }
 
 SharedLib::entrypoint *
 SharedLib::getDllSymbol (std::string &symbol)
 {
-    getDllSymbol(symbol.c_str());
+    return getDllSymbol(symbol.c_str());
 }
 
 SharedLib::initentry *