[Gnash-commit] gnash/server/parser bitmap_character_def.h

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/09/22 07:31:31

Modified files:
        server/parser  : bitmap_character_def.h 

Log message:
        There are problems with yasper.h on win32

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/bitmap_character_def.h?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: bitmap_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/bitmap_character_def.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- bitmap_character_def.h      21 Sep 2006 13:55:56 -0000      1.6
+++ bitmap_character_def.h      22 Sep 2006 07:31:30 -0000      1.7
@@ -49,9 +49,14 @@
 #include "types.h"
 #include "container.h"
 #include "utility.h"
-//#include "smart_ptr.h"
+
+#ifdef WIN32
+#include "smart_ptr.h"
+#else
 #include "yasper.h"
 using yasper::ptr;
+#endif
+
 //#include "movie_interface.h"
 #include <cstdarg>
 #include <cassert>
@@ -94,11 +99,20 @@
 
     gnash::bitmap_info*        get_bitmap_info()
        {
+#ifdef WIN32
+               return m_bitmap_info.get_ptr();
+#else
            return m_bitmap_info.GetRawPointer();
+#endif
        }
 
 private:
+
+#ifdef WIN32
+       smart_ptr<gnash::bitmap_info>       m_bitmap_info;
+#else
     ptr<gnash::bitmap_info>    m_bitmap_info;
+#endif
 };
 
 #endif