- Get back to using deprecated functions (because of linux...).

- Disable warning 4996.

svn path=/trunk/; revision=38301

diff --git a/reactos/tools/rbuild/automaticdependency.cpp b/reactos/tools/rbuild/automaticdependency.cpp
index 2f3aa85..ac13ac1 100644 (file)
--- a/reactos/tools/rbuild/automaticdependency.cpp
+++ b/reactos/tools/rbuild/automaticdependency.cpp
@@ -60,7 +60,7 @@ SourceFile::Open ()
        if ( !f )
                throw FileNotFoundException ( filename );
 
-       if ( fstat ( _fileno ( f ), &statbuf ) != 0 )
+       if ( fstat ( fileno ( f ), &statbuf ) != 0 )
        {
                fclose ( f );
                throw AccessDeniedException ( filename );

diff --git a/reactos/tools/rbuild/backend/backend.cpp b/reactos/tools/rbuild/backend/backend.cpp
index 51ae59c..c722768 100644 (file)
--- a/reactos/tools/rbuild/backend/backend.cpp
+++ b/reactos/tools/rbuild/backend/backend.cpp
@@ -32,7 +32,7 @@ Backend::Factory::ref = 0;
 Backend::Factory::Factory ( const std::string& name_, const std::string& description_ )
 {
        string name(name_);
-       _strlwr ( &name[0] );
+       strlwr ( &name[0] );
        if ( !ref++ )
                factories = new map<string,Factory*>;
        (*factories)[name] = this;
@@ -55,7 +55,7 @@ Backend::Factory::Create ( const string& name,
                            Configuration& configuration )
 {
        string sname ( name );
-       _strlwr ( &sname[0] );
+       strlwr ( &sname[0] );
        if ( !factories || !factories->size () )
                throw InvalidOperationException ( __FILE__,
                                                  __LINE__,

diff --git a/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp b/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp
index 5c6c5cf..9648bc4 100644 (file)
--- a/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp
+++ b/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp
@@ -268,7 +268,7 @@ CBBackend::_get_object_files ( const Module& module, vector<string>& out) const
                        string::size_type pos = file.find_last_of (sSep);
                        if ( pos != string::npos )
                                file.erase ( 0, pos+1 );
-                       if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) )
+                       if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )
                                file = ReplaceExtension ( file, ".res" );
                        else
                                file = ReplaceExtension ( file, ".obj" );
@@ -429,7 +429,7 @@ CBBackend::_generate_cbproj ( const Module& module )
                        string fullpath = files[i]->file.relative_path + sSep + files[i]->file.name;
                        string file = string(".") + &fullpath[cbproj_path.size()];
 
-                       if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) )
+                       if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )
                                resource_files.push_back ( file );
                        else
                                source_files.push_back ( file );

diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp
index 8c3bbfe..1249ba6 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/mingw.cpp
+++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp
@@ -621,7 +621,7 @@ MingwBackend::GenerateXmlBuildFilesMacro() const
                if ( !f )
                throw FileNotFoundException ( NormalizeFilename ( xmlbuildfile.topIncludeFilename ) );
 
-               if ( fstat ( _fileno ( f ), &statbuf ) != 0 )
+               if ( fstat ( fileno ( f ), &statbuf ) != 0 )
                {
                        fclose ( f );
                        throw AccessDeniedException ( NormalizeFilename ( xmlbuildfile.topIncludeFilename ) );
@@ -1064,7 +1064,7 @@ MingwBackend::DetectPipeSupport ()
        {
                usePipe = (exitcode == 0);
                fclose ( f );
-               _unlink ( pipe_detectionObjectFilename.c_str () );
+               unlink ( pipe_detectionObjectFilename.c_str () );
        }
        else
                usePipe = false;
@@ -1097,7 +1097,7 @@ MingwBackend::DetectPCHSupport ()
                {
                        use_pch = true;
                        fclose ( f );
-                       _unlink ( path.c_str () );
+                       unlink ( path.c_str () );
                }
                else
                        use_pch = false;

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 1d1af89..86d7a5c 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -63,7 +63,7 @@ string
 GetTargetMacro ( const Module& module, bool with_dollar )
 {
        string s ( module.name );
-       _strupr ( &s[0] );
+       strupr ( &s[0] );
        s += "_TARGET";
        if ( with_dollar )
                return ssprintf ( "$(%s)", s.c_str() );
@@ -2399,13 +2399,13 @@ MingwAddCRTLibrary( Module &module )
        const char * crtAttr = module.CRT.c_str ();
        const char * crtLib = NULL;
 
-       if ( _stricmp ( crtAttr, "libc" ) == 0 )
+       if ( stricmp ( crtAttr, "libc" ) == 0 )
                crtLib = "crt";
-       else if ( _stricmp ( crtAttr, "msvcrt" ) == 0 )
+       else if ( stricmp ( crtAttr, "msvcrt" ) == 0 )
                crtLib = "msvcrt";
-       else if ( _stricmp ( crtAttr, "libcntpr" ) == 0 )
+       else if ( stricmp ( crtAttr, "libcntpr" ) == 0 )
                crtLib = "libcntpr";
-       else if ( _stricmp ( crtAttr, "ntdll" ) == 0 )
+       else if ( stricmp ( crtAttr, "ntdll" ) == 0 )
                crtLib = "ntdll";
 
        if ( crtLib )

diff --git a/reactos/tools/rbuild/backend/msvc/msvc.cpp b/reactos/tools/rbuild/backend/msvc/msvc.cpp
index 573fc36..6e74493 100644 (file)
--- a/reactos/tools/rbuild/backend/msvc/msvc.cpp
+++ b/reactos/tools/rbuild/backend/msvc/msvc.cpp
@@ -21,6 +21,7 @@
  */
 #ifdef _MSC_VER
 #pragma warning ( disable : 4786 )
+#pragma warning ( disable : 4996 )
 #endif//_MSC_VER
 
 #include <iostream>
@@ -340,7 +341,7 @@ MSVCBackend::_get_object_files ( const Module& module, vector<string>& out) cons
                        string::size_type pos = file.find_last_of (DEF_SSEP);
                        if ( pos != string::npos )
                                file.erase ( 0, pos+1 );
-                       if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) )
+                       if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )
                                file = ReplaceExtension ( file, ".res" );
                        else
                                file = ReplaceExtension ( file, ".obj" );

diff --git a/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp b/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
index 1a7d171..b437e6d 100644 (file)
--- a/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
+++ b/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
@@ -108,11 +108,11 @@ MSVCBackend::_generate_dsp ( const Module& module )
                        string file = path + std::string("\\") + files[i]->file.name;
 
                        source_files.push_back ( file );
-                       if ( !_stricmp ( Right(file,2).c_str(), ".c" ) )
+                       if ( !stricmp ( Right(file,2).c_str(), ".c" ) )
                                c_srcs.push_back ( file );
-                       if ( !_stricmp ( Right(file,2).c_str(), ".h" ) )
+                       if ( !stricmp ( Right(file,2).c_str(), ".h" ) )
                                header_files.push_back ( file );
-                       if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) )
+                       if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )
                                resource_files.push_back ( file );
                }
                const vector<Include*>& incs = data.includes;

diff --git a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
index ac1059d..ed744fb 100644 (file)
--- a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
+++ b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
@@ -159,9 +159,9 @@ MSVCBackend::_generate_vcproj ( const Module& module )
                                module.output->relative_path );
                        string file = path + std::string("\\") + files[i]->file.name;
 
-                       if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) )
+                       if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )
                                resource_files.push_back ( file );
-                       else if ( !_stricmp ( Right(file,2).c_str(), ".h" ) )
+                       else if ( !stricmp ( Right(file,2).c_str(), ".h" ) )
                                header_files.push_back ( file );
                        else
                                source_files.push_back ( file );

diff --git a/reactos/tools/rbuild/compilationunit.cpp b/reactos/tools/rbuild/compilationunit.cpp
index 81eb387..35d0311 100644 (file)
--- a/reactos/tools/rbuild/compilationunit.cpp
+++ b/reactos/tools/rbuild/compilationunit.cpp
@@ -88,7 +88,7 @@ CompilationUnit::HasFileWithExtension ( const std::string& extension ) const
        {
                const File& file = *files[i];
                string fileExtension = GetExtension ( file.file );
-               if ( !_stricmp ( fileExtension.c_str (), extension.c_str () ) )
+               if ( !stricmp ( fileExtension.c_str (), extension.c_str () ) )
                        return true;
        }
        return false;

diff --git a/reactos/tools/rbuild/directory.cpp b/reactos/tools/rbuild/directory.cpp
index 9b9ce3e..3813283 100644 (file)
--- a/reactos/tools/rbuild/directory.cpp
+++ b/reactos/tools/rbuild/directory.cpp
@@ -26,7 +26,7 @@
 #endif//_MSC_VER
 
 #ifdef WIN32
-#define MKDIR(s) _mkdir(s)
+#define MKDIR(s) mkdir(s)
 #else
 #define MKDIR(s) mkdir(s, 0755)
 #endif

diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index 06b7158..6f71b95 100644 (file)
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -238,9 +238,9 @@ bool Module::GetBooleanAttribute ( const XMLElement& moduleNode, const char * na
        if ( att != NULL )
        {
                const char* p = att->value.c_str();
-               if ( !_stricmp ( p, "true" ) || !_stricmp ( p, "yes" ) )
+               if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) )
                        return true;
-               else if ( !_stricmp ( p, "false" ) || !_stricmp ( p, "no" ) )
+               else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) )
                        return false;
                else
                {
@@ -358,26 +358,26 @@ Module::Module ( const Project& project,
        {
                CRT = att->value;
 
-               if ( _stricmp ( CRT.c_str (), "auto" ) == 0 )
+               if ( stricmp ( CRT.c_str (), "auto" ) == 0 )
                        CRT = GetDefaultModuleCRT ();
        }
        else
                CRT = GetDefaultModuleCRT ();
 
        const char * crtAttr = CRT.c_str ();
-       if ( crtAttr == NULL || _stricmp ( crtAttr, "none" ) == 0 )
+       if ( crtAttr == NULL || stricmp ( crtAttr, "none" ) == 0 )
                dynamicCRT = false;
-       else if ( _stricmp ( crtAttr, "libc" ) == 0 )
+       else if ( stricmp ( crtAttr, "libc" ) == 0 )
                dynamicCRT = false;
-       else if ( _stricmp ( crtAttr, "msvcrt" ) == 0 )
+       else if ( stricmp ( crtAttr, "msvcrt" ) == 0 )
                dynamicCRT = true;
-       else if ( _stricmp ( crtAttr, "libcntpr" ) == 0 )
+       else if ( stricmp ( crtAttr, "libcntpr" ) == 0 )
                dynamicCRT = false;
-       else if ( _stricmp ( crtAttr, "ntdll" ) == 0 )
+       else if ( stricmp ( crtAttr, "ntdll" ) == 0 )
                dynamicCRT = true;
-       else if ( _stricmp ( crtAttr, "static" ) == 0 )
+       else if ( stricmp ( crtAttr, "static" ) == 0 )
                dynamicCRT = false;
-       else if ( _stricmp ( crtAttr, "dll" ) == 0 )
+       else if ( stricmp ( crtAttr, "dll" ) == 0 )
                dynamicCRT = true;
        else
        {
@@ -609,9 +609,9 @@ Module::ProcessXMLSubElement ( const XMLElement& e,
                const XMLAttribute* att = e.GetAttribute ( "first", false );
                if ( att != NULL )
                {
-                       if ( !_stricmp ( att->value.c_str(), "true" ) )
+                       if ( !stricmp ( att->value.c_str(), "true" ) )
                                first = true;
-                       else if ( _stricmp ( att->value.c_str(), "false" ) )
+                       else if ( stricmp ( att->value.c_str(), "false" ) )
                        {
                                throw XMLInvalidBuildFileException (
                                        e.location,
@@ -626,11 +626,11 @@ Module::ProcessXMLSubElement ( const XMLElement& e,
                {
                        // check for c++ file
                        string ext = GetExtension ( e.value );
-                       if ( !_stricmp ( ext.c_str(), ".cpp" ) )
+                       if ( !stricmp ( ext.c_str(), ".cpp" ) )
                                cplusplus = true;
-                       else if ( !_stricmp ( ext.c_str(), ".cc" ) )
+                       else if ( !stricmp ( ext.c_str(), ".cc" ) )
                                cplusplus = true;
-                       else if ( !_stricmp ( ext.c_str(), ".cxx" ) )
+                       else if ( !stricmp ( ext.c_str(), ".cxx" ) )
                                cplusplus = true;
                }
                File* pFile = new File ( directory,
@@ -1857,9 +1857,9 @@ Property::Property ( const XMLElement& node_,
        if ( att != NULL )
        {
                const char* p = att->value.c_str();
-               if ( !_stricmp ( p, "true" ) || !_stricmp ( p, "yes" ) )
+               if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) )
                        isInternal = true;
-               else if ( !_stricmp ( p, "false" ) || !_stricmp ( p, "no" ) )
+               else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) )
                        isInternal = false;
                else
                {

diff --git a/reactos/tools/rbuild/pch.h b/reactos/tools/rbuild/pch.h
index 7b6e9a9..42b44d0 100644 (file)
--- a/reactos/tools/rbuild/pch.h
+++ b/reactos/tools/rbuild/pch.h
@@ -20,6 +20,7 @@
 
 #ifdef _MSC_VER
 #pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information
+#pragma warning ( disable : 4996 ) // CRT deprecate
 #endif//_MSC_VER
 
 #include <string>

diff --git a/reactos/tools/rbuild/rbuild.vcproj b/reactos/tools/rbuild/rbuild.vcproj
index 7e218d6..f6f69e2 100644 (file)
--- a/reactos/tools/rbuild/rbuild.vcproj
+++ b/reactos/tools/rbuild/rbuild.vcproj
@@ -133,7 +133,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos;../../include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST;_CRT_SECURE_NO_WARNINGS;_CRT_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                DefaultCharIsUnsigned="true"\r

diff --git a/reactos/tools/rbuild/testsupportcode.cpp b/reactos/tools/rbuild/testsupportcode.cpp
index 179e60b..51d2039 100644 (file)
--- a/reactos/tools/rbuild/testsupportcode.cpp
+++ b/reactos/tools/rbuild/testsupportcode.cpp
@@ -293,7 +293,7 @@ TestSupportCode::GetTestDispatcherName ( string filename )
 bool
 TestSupportCode::IsTestFile ( string& filename ) const
 {
-       if ( _stricmp ( GetFilename ( filename ).c_str (), "setup.c" ) == 0 )
+       if ( stricmp ( GetFilename ( filename ).c_str (), "setup.c" ) == 0 )
                return false;
        return true;
 }