[Gnash-commit] gnash/server StreamProvider.cpp URLAccessManage...

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/08/24 14:44:05

Modified files:
        server         : StreamProvider.cpp URLAccessManager.cpp 
                         dlist.cpp 

Log message:
        porting to win32

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StreamProvider.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/URLAccessManager.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: StreamProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/StreamProvider.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- StreamProvider.cpp  23 Aug 2006 23:18:53 -0000      1.7
+++ StreamProvider.cpp  24 Aug 2006 14:44:05 -0000      1.8
@@ -60,6 +60,11 @@
 #include <string>
 #include <vector>
 
+#if defined(_WIN32) || defined(WIN32)
+#      include <io.h>
+#      define dup _dup
+#endif
+
 namespace gnash
 {
 

Index: URLAccessManager.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/URLAccessManager.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- URLAccessManager.cpp        23 Aug 2006 23:45:28 -0000      1.2
+++ URLAccessManager.cpp        24 Aug 2006 14:44:05 -0000      1.3
@@ -49,7 +49,7 @@
 #include <iostream>
 
 #ifdef WIN32
-#      include <io.h>
+# include <Winsock2.h> //vv
 #else
 #      include <unistd.h>
 #endif
@@ -164,7 +164,7 @@
 static bool
 host_check(const std::string& host)
 {
-    GNASH_REPORT_FUNCTION;
+//    GNASH_REPORT_FUNCTION;
 
     std::cerr << "Checking security of host: " << host << std::endl;
     

Index: dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- dlist.cpp   23 Aug 2006 20:56:22 -0000      1.22
+++ dlist.cpp   24 Aug 2006 14:44:05 -0000      1.23
@@ -420,7 +420,7 @@
 //     container_type::size_type size = _characters.size();
 
        //Vitaly:  That there was no crash gnash we iterate through the copy
-       std::list<DisplayItem> tmp_list = _characters;  //vv
+       std::list<DisplayItem> tmp_list = _characters;
 
        for (iterator it = tmp_list.begin(), itEnd = tmp_list.end();
                it != itEnd; ++it)