From 0fa81bc0da2109631324b63c6256a852fddf0557 Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Sun, 21 Sep 2008 13:00:40 +0000 Subject: [PATCH] Wow, WriteConfigurationFile() in rbuild never worked since it was added in r13496 over 3 years ago! :-) Thus, the generated "roscfg.h" was always empty, but for whatever reason modules started to include it. I removed all dependencies on this file and the function itself from rbuild. svn path=/trunk/; revision=36373 --- reactos/dll/win32/dhcpcsvc/dhcpcsvc.c | 1 - reactos/dll/win32/iphlpapi/ipstats_reactos.c | 1 - reactos/dll/win32/ws2_32/include/upcall.h | 2 - reactos/dll/win32/ws2_32/include/ws2_32.h | 1 - reactos/dll/win32/ws2_32/misc/dllmain.c | 1 - reactos/dll/win32/ws2_32/misc/sndrcv.c | 1 - reactos/dll/win32/ws2_32/misc/upcall.c | 1 - .../drivers/network/dd/ne2000/ne2000/8390.c | 1 - .../drivers/network/dd/ne2000/ne2000/main.c | 1 - reactos/drivers/network/lan/include/precomp.h | 1 - .../drivers/network/tcpip/include/precomp.h | 2 - .../network/tcpip/tests/tests/ipreceive.c | 1 - .../tcpip/tests/tests/tigetprotocolnumber.c | 1 - .../lib/drivers/oskittcp/include/oskitdebug.h | 3 - .../lib/drivers/oskittcp/include/oskittcp.h | 3 - .../drivers/oskittcp/oskittcp/uipc_socket.c | 3 - reactos/ntoskrnl/ke/i386/ctxswitch.S | 1 - reactos/ntoskrnl/ke/powerpc/main_asm.S | 1 - reactos/tools/rbuild/project.cpp | 63 ------------------- reactos/tools/rbuild/rbuild.cpp | 1 - reactos/tools/rbuild/rbuild.h | 6 -- 21 files changed, 96 deletions(-) diff --git a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c index cf382b94751..4d3a6b57a07 100644 --- a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c +++ b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c @@ -6,7 +6,6 @@ * COPYRIGHT: Copyright 2005 Art Yerkes */ -#include #include #include #include diff --git a/reactos/dll/win32/iphlpapi/ipstats_reactos.c b/reactos/dll/win32/iphlpapi/ipstats_reactos.c index 358c0218933..8b13451ebc9 100644 --- a/reactos/dll/win32/iphlpapi/ipstats_reactos.c +++ b/reactos/dll/win32/iphlpapi/ipstats_reactos.c @@ -19,7 +19,6 @@ * tcpip.sys */ -#include #include #include "iphlpapi_private.h" diff --git a/reactos/dll/win32/ws2_32/include/upcall.h b/reactos/dll/win32/ws2_32/include/upcall.h index ede4e1ef931..3fe222de0e9 100644 --- a/reactos/dll/win32/ws2_32/include/upcall.h +++ b/reactos/dll/win32/ws2_32/include/upcall.h @@ -7,8 +7,6 @@ #ifndef __UPCALL_H #define __UPCALL_H -#include - BOOL WSPAPI WPUCloseEvent( diff --git a/reactos/dll/win32/ws2_32/include/ws2_32.h b/reactos/dll/win32/ws2_32/include/ws2_32.h index 8b0e9a2f41c..f495fa1ef07 100644 --- a/reactos/dll/win32/ws2_32/include/ws2_32.h +++ b/reactos/dll/win32/ws2_32/include/ws2_32.h @@ -8,7 +8,6 @@ #define __WS2_32_H #define WIN32_NO_STATUS -#include #include #include #include diff --git a/reactos/dll/win32/ws2_32/misc/dllmain.c b/reactos/dll/win32/ws2_32/misc/dllmain.c index c9e07cb4c9f..ea4e2f33161 100644 --- a/reactos/dll/win32/ws2_32/misc/dllmain.c +++ b/reactos/dll/win32/ws2_32/misc/dllmain.c @@ -8,7 +8,6 @@ * CSH 01/09-2000 Created */ -#include #include #include #include diff --git a/reactos/dll/win32/ws2_32/misc/sndrcv.c b/reactos/dll/win32/ws2_32/misc/sndrcv.c index ec3384b7f55..f1b68feb158 100644 --- a/reactos/dll/win32/ws2_32/misc/sndrcv.c +++ b/reactos/dll/win32/ws2_32/misc/sndrcv.c @@ -8,7 +8,6 @@ * CSH 01/09-2000 Created */ -#include #include #include #include diff --git a/reactos/dll/win32/ws2_32/misc/upcall.c b/reactos/dll/win32/ws2_32/misc/upcall.c index c5bee36abde..dc358cae5b8 100644 --- a/reactos/dll/win32/ws2_32/misc/upcall.c +++ b/reactos/dll/win32/ws2_32/misc/upcall.c @@ -7,7 +7,6 @@ * REVISIONS: * CSH 01/09-2000 Created */ -#include #include #include #include diff --git a/reactos/drivers/network/dd/ne2000/ne2000/8390.c b/reactos/drivers/network/dd/ne2000/ne2000/8390.c index 669ef721e71..bfe993434ea 100644 --- a/reactos/drivers/network/dd/ne2000/ne2000/8390.c +++ b/reactos/drivers/network/dd/ne2000/ne2000/8390.c @@ -7,7 +7,6 @@ * REVISIONS: * CSH 27/08-2000 Created */ -#include #include #include diff --git a/reactos/drivers/network/dd/ne2000/ne2000/main.c b/reactos/drivers/network/dd/ne2000/ne2000/main.c index 44142e35577..f84779de0df 100644 --- a/reactos/drivers/network/dd/ne2000/ne2000/main.c +++ b/reactos/drivers/network/dd/ne2000/ne2000/main.c @@ -7,7 +7,6 @@ * REVISIONS: * CSH 27/08-2000 Created */ -#include #include #include diff --git a/reactos/drivers/network/lan/include/precomp.h b/reactos/drivers/network/lan/include/precomp.h index f152c32497a..31c14790fbc 100644 --- a/reactos/drivers/network/lan/include/precomp.h +++ b/reactos/drivers/network/lan/include/precomp.h @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include "net_lan.h" diff --git a/reactos/drivers/network/tcpip/include/precomp.h b/reactos/drivers/network/tcpip/include/precomp.h index 5906ced640f..82e15cef80a 100644 --- a/reactos/drivers/network/tcpip/include/precomp.h +++ b/reactos/drivers/network/tcpip/include/precomp.h @@ -1,11 +1,9 @@ -#include #include #include #include #include #include #include <../recmutex/recmutex.h> -#include #include #include #include diff --git a/reactos/drivers/network/tcpip/tests/tests/ipreceive.c b/reactos/drivers/network/tcpip/tests/tests/ipreceive.c index 2ba1b802f68..326d6dde136 100644 --- a/reactos/drivers/network/tcpip/tests/tests/ipreceive.c +++ b/reactos/drivers/network/tcpip/tests/tests/ipreceive.c @@ -1,4 +1,3 @@ -#include #include "../../include/precomp.h" #include "regtests.h" diff --git a/reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c b/reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c index 1fe21649d79..43f2a97ffb7 100644 --- a/reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c +++ b/reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c @@ -1,4 +1,3 @@ -#include #include "../../include/precomp.h" #include "regtests.h" diff --git a/reactos/lib/drivers/oskittcp/include/oskitdebug.h b/reactos/lib/drivers/oskittcp/include/oskitdebug.h index c753fb4c13c..c7824b395c6 100644 --- a/reactos/lib/drivers/oskittcp/include/oskitdebug.h +++ b/reactos/lib/drivers/oskittcp/include/oskitdebug.h @@ -33,9 +33,6 @@ #define OSK_DEBUG_CPOINT 0x00800000 #define OSK_DEBUG_ULTRA 0xFFFFFFFF -#ifndef _MSC_VER -#include -#endif/*_MSC_VER*/ #include #ifdef DBG diff --git a/reactos/lib/drivers/oskittcp/include/oskittcp.h b/reactos/lib/drivers/oskittcp/include/oskittcp.h index 0971f50d350..c3d1c00c66a 100644 --- a/reactos/lib/drivers/oskittcp/include/oskittcp.h +++ b/reactos/lib/drivers/oskittcp/include/oskittcp.h @@ -5,9 +5,6 @@ #include #endif -#ifndef _MSC_VER -#include -#endif/*_MSC_VER*/ #ifdef KERNEL #include #include diff --git a/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c b/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c index 685d590dea3..900dec138b9 100644 --- a/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c +++ b/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c @@ -33,9 +33,6 @@ * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 */ -#ifndef _MSC_VER -#include -#endif/*_MSC_VER*/ #include #include #include diff --git a/reactos/ntoskrnl/ke/i386/ctxswitch.S b/reactos/ntoskrnl/ke/i386/ctxswitch.S index 73fe48388ee..45abea5e421 100644 --- a/reactos/ntoskrnl/ke/i386/ctxswitch.S +++ b/reactos/ntoskrnl/ke/i386/ctxswitch.S @@ -10,7 +10,6 @@ /* INCLUDES ******************************************************************/ -//#include #include .intel_syntax noprefix diff --git a/reactos/ntoskrnl/ke/powerpc/main_asm.S b/reactos/ntoskrnl/ke/powerpc/main_asm.S index 59a891105fd..8476be64c77 100644 --- a/reactos/ntoskrnl/ke/powerpc/main_asm.S +++ b/reactos/ntoskrnl/ke/powerpc/main_asm.S @@ -1,4 +1,3 @@ -#include #include #define AP_MAGIC (0x12481020) diff --git a/reactos/tools/rbuild/project.cpp b/reactos/tools/rbuild/project.cpp index 0592dc2604e..ea63bf5ddd9 100644 --- a/reactos/tools/rbuild/project.cpp +++ b/reactos/tools/rbuild/project.cpp @@ -250,69 +250,6 @@ Project::ResolveProperties ( const string& s ) const return s2; } -void -Project::SetConfigurationOption ( char* s, - string name, - string alternativeName ) -{ - const Property* property = LookupProperty ( name ); - if ( property != NULL && property->value.length () > 0 ) - { - s = s + sprintf ( s, - "#define %s=%s\n", - property->name.c_str (), - property->value.c_str () ); - } - else if ( property != NULL ) - { - s = s + sprintf ( s, - "#define %s\n", - property->name.c_str () ); - } - else if ( !alternativeName.empty() ) - { - s = s + sprintf ( s, - "#define %s\n", - alternativeName.c_str () ); - } -} - -void -Project::SetConfigurationOption ( char* s, - string name ) -{ - SetConfigurationOption ( s, name, "" ); -} - -void -Project::WriteConfigurationFile () -{ - char* buf; - char* s; - - buf = (char*) malloc ( 10*1024 ); - if ( buf == NULL ) - throw OutOfMemoryException (); - - s = buf; - s = s + sprintf ( s, "/* Automatically generated. " ); - s = s + sprintf ( s, "Edit config.xml to change configuration */\n" ); - s = s + sprintf ( s, "#ifndef __INCLUDE_CONFIG_H\n" ); - s = s + sprintf ( s, "#define __INCLUDE_CONFIG_H\n" ); - - SetConfigurationOption ( s, "ARCH" ); - SetConfigurationOption ( s, "OPTIMIZED" ); - SetConfigurationOption ( s, "MP", "UP"); - SetConfigurationOption ( s, "ACPI" ); - SetConfigurationOption ( s, "_3GB" ); - - s = s + sprintf ( s, "#endif /* __INCLUDE_CONFIG_H */\n" ); - - FileSupportCode::WriteIfChanged ( buf, Environment::GetIntermediatePath() + sSep + "include" + sSep + "roscfg.h" ); - - free ( buf ); -} - void Project::ExecuteInvocations () { diff --git a/reactos/tools/rbuild/rbuild.cpp b/reactos/tools/rbuild/rbuild.cpp index 03fdc9eb026..d81fd3b80b3 100644 --- a/reactos/tools/rbuild/rbuild.cpp +++ b/reactos/tools/rbuild/rbuild.cpp @@ -329,7 +329,6 @@ main ( int argc, char** argv ) project, configuration ) ); - project.WriteConfigurationFile (); project.ExecuteInvocations (); project.GetBackend().Process(); diff --git a/reactos/tools/rbuild/rbuild.h b/reactos/tools/rbuild/rbuild.h index 287075417d4..be8dd7eff58 100644 --- a/reactos/tools/rbuild/rbuild.h +++ b/reactos/tools/rbuild/rbuild.h @@ -243,7 +243,6 @@ public: ~Project (); void SetBackend ( Backend* backend ) { _backend = backend; } Backend& GetBackend() { return *_backend; } - void WriteConfigurationFile (); void ExecuteInvocations (); void ProcessXML ( const std::string& path ); @@ -254,11 +253,6 @@ public: const Property* LookupProperty ( const std::string& name ) const; private: std::string ResolveNextProperty ( const std::string& s ) const; - void SetConfigurationOption ( char* s, - std::string name, - std::string alternativeName ); - void SetConfigurationOption ( char* s, - std::string name ); void ReadXml (); void ProcessXMLSubElement ( const XMLElement& e, const std::string& path,