msvc6 compatibility
Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp
Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
Modified: trunk/reactos/tools/rbuild/stubbedcomponent.cpp
_____
Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp
--- trunk/reactos/tools/rbuild/automaticdependency.cpp 2005-08-23
23:06:19 UTC (rev 17492)
+++ trunk/reactos/tools/rbuild/automaticdependency.cpp 2005-08-23
23:06:58 UTC (rev 17493)
@@ -376,11 +376,12 @@
Include& currentDirectory,
bool
searchCurrentDirectory )
{
+ size_t i;
if ( searchCurrentDirectory )
includes.push_back( ¤tDirectory );
- for ( size_t i = 0; i < module.non_if_data.includes.size (); i++
)
+ for ( i = 0; i < module.non_if_data.includes.size (); i++ )
includes.push_back( module.non_if_data.includes[i] );
- for ( size_t i = 0; i < module.project.non_if_data.includes.size
(); i++ )
+ for ( i = 0; i < module.project.non_if_data.includes.size ();
i++ )
includes.push_back(
module.project.non_if_data.includes[i] );
}
@@ -469,11 +470,12 @@
AutomaticDependency::CheckAutomaticDependenciesForModule ( Module&
module,
bool verbose
)
{
+ size_t mi;
vector<const Module*> modules;
GetModulesToCheck ( module, modules );
- for ( size_t mi = 0; mi < modules.size (); mi++ )
+ for ( mi = 0; mi < modules.size (); mi++ )
ParseFiles ( *modules[mi] );
- for ( size_t mi = 0; mi < modules.size (); mi++ )
+ for ( mi = 0; mi < modules.size (); mi++ )
CheckAutomaticDependencies ( *modules[mi], verbose );
}
_____
Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-08-23
23:06:19 UTC (rev 17492)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-08-23
23:06:58 UTC (rev 17493)
@@ -19,7 +19,9 @@
#include "mingw.h"
#include <assert.h>
+#ifndef _MSC_VER
#include <dirent.h>
+#endif//_MSC_VER
#include "modulehandler.h"
#ifdef WIN32
@@ -88,6 +90,7 @@
bool
Directory::mkdir_p ( const char* path )
{
+#ifndef _MSC_VER
DIR *directory;
directory = opendir ( path );
if ( directory != NULL )
@@ -95,9 +98,16 @@
closedir ( directory );
return false;
}
+#endif//_MSC_VER
if ( MKDIR ( path ) != 0 )
+ {
+#ifdef _MSC_VER
+ if ( errno == EEXIST )
+ return false;
+#endif//_MSC_VER
throw AccessDeniedException ( string ( path ) );
+ }
return true;
}
_____
Modified: trunk/reactos/tools/rbuild/stubbedcomponent.cpp
--- trunk/reactos/tools/rbuild/stubbedcomponent.cpp 2005-08-23
23:06:19 UTC (rev 17492)
+++ trunk/reactos/tools/rbuild/stubbedcomponent.cpp 2005-08-23
23:06:58 UTC (rev 17493)
@@ -107,7 +107,7 @@
size_t end = symbol.length () - 1;
while ( end > 0 && isdigit ( symbol[end] ) )
end--;
- if ( end > 0 and symbol[end] == '@' )
+ if ( end > 0 && symbol[end] == '@' )
end--;
if ( end > 0 )
return symbol.substr ( start, end - start + 1 );
Show replies by date