[Scummvm-cvs-logs] CVS: scummex blocks.h,1.3,1.4 resource.cpp,1.8,1.9 wxwindows.cpp,1.5,1.6

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummex
In directory sc8-pr-cvs1:/tmp/cvs-serv1609

Modified Files:
	blocks.h resource.cpp wxwindows.cpp 
Log Message:
changed name BSTR to TBSTR, to prevent name conflict under msvc7

Index: blocks.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/blocks.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- blocks.h	18 Sep 2003 20:50:55 -0000	1.3
+++ blocks.h	21 Sep 2003 06:47:15 -0000	1.4
@@ -109,7 +109,7 @@
 	AKOS,
 	ZP04,
 	RMSC,
-	BSTR,
+	TBSTR,
 	ZPLN,
 	AKHD,
 	AKPL,

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- resource.cpp	21 Sep 2003 00:45:16 -0000	1.8
+++ resource.cpp	21 Sep 2003 06:47:15 -0000	1.9
@@ -622,7 +622,7 @@
 			break;
 		
 		case IMAG:
-		case BSTR:
+		case TBSTR:
 			v8 = 1;
 			_blockTable[index].blockSize = _input.readUint32BE();
 			_gui->add_tree_elements(_blockTable[index].blockName, index, level, _blockTable[index].blockTypeID);

Index: wxwindows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/wxwindows.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- wxwindows.cpp	19 Sep 2003 19:57:07 -0000	1.5
+++ wxwindows.cpp	21 Sep 2003 06:47:15 -0000	1.6
@@ -958,7 +958,7 @@
 			break;
 			
 		case SMAP:
-		case BSTR:
+		case TBSTR:
 			bigIconBitmap = wxBitmap(xpm_42_big);
 			break;