Index: inc/openib.def
===================================================================
--- inc/openib.def	(revision 1120)
+++ inc/openib.def	(working copy)
@@ -2,7 +2,7 @@
 
 # Allow overriding the company name.
 !IF !DEFINED(IB_COMPANYNAME)
-IB_COMPANYNAME="""OpenFabrics\x20Alliance"""
+IB_COMPANYNAME="""OpenFabrics\40Alliance"""
 !ENDIF
 
 # Allow overriding the product name.
Index: tools/flint/user/flint.cpp
===================================================================
--- tools/flint/user/flint.cpp	(revision 1120)
+++ tools/flint/user/flint.cpp	(working copy)
@@ -523,13 +523,13 @@
     u_int32_ba(u_int32_t i = 0) :
     _bits(i),
     _rbits(_bits),
-    _sptr(0),
+    _sptr1(0),
     _eptr(31)    {}
 
     u_int32_ba  operator[](u_int32_t idx) {return range((u_int8_t)idx,(u_int8_t)idx);}
-    u_int32_ba& operator= (u_int32_t i)   {_rbits = ((i << _sptr) & mask()) | (_rbits & ~mask()); return *this;}
+    u_int32_ba& operator= (u_int32_t i)   {_rbits = ((i << _sptr1) & mask()) | (_rbits & ~mask()); return *this;}
     u_int32_t*  operator& ()              {return &_bits;}
-    operator    u_int32_t ()              {return((mask() & _rbits) >> _sptr);}
+    operator    u_int32_t ()              {return((mask() & _rbits) >> _sptr1);}
 
     u_int32_ba  range     (u_int8_t eptr, 
                            u_int8_t sptr) {return u_int32_ba(*this,eptr,sptr);}
@@ -538,14 +538,14 @@
     u_int32_ba(u_int32_ba& other, u_int8_t eptr, u_int8_t sptr) :
     _bits(other._bits),
     _rbits(other._bits),
-    _sptr(sptr),
+    _sptr1(sptr),
     _eptr(eptr) {}
 
     u_int32_t  mask       () {
         u_int32_t s_msk = (u_int32_t)-1; // start mask
         u_int32_t e_msk = (u_int32_t)-1; // end mask
 
-        s_msk = (s_msk << _sptr);
+        s_msk = (s_msk << _sptr1);
         e_msk = (_eptr >= (sizeof(_bits)*8-1)) ? e_msk : ~(e_msk << (_eptr+1));
 
         return(s_msk & e_msk);
@@ -554,7 +554,7 @@
     u_int32_t  _bits;
     u_int32_t& _rbits;
 
-    u_int8_t   _sptr;
+    u_int8_t   _sptr1;
     u_int8_t   _eptr;
 };
 
Index: tools/flint/user/SOURCES
===================================================================
--- tools/flint/user/SOURCES	(revision 1120)
+++ tools/flint/user/SOURCES	(working copy)
@@ -2,6 +2,7 @@
 TARGETTYPE=PROGRAM
 UMTYPE=console
 USE_MSVCRT=1
+USE_STL=1
 
 TRUNK=..\..\..
 !if !defined(EXTERNAL_TOOLS)
@@ -17,11 +18,6 @@
 
 # TODO: Define free and checked.
 TARGETLIBS=\
-!if $(FREEBUILD)
-	$(CRT_LIB_PATH)\msvcprt.lib \
-!else
-	$(CRT_LIB_PATH)\msvcprt.lib \
-!endif	
     $(TARGETPATH)\*\mtcr.lib \
     $(SDK_LIB_PATH)\Ws2_32.lib