Do not define __REACTOS__ twice

svn path=/trunk/; revision=29423
2025-08-03 12:06:52 +00:00 · 2007-10-06 19:18:55 +00:00 · 2007-10-06 19:18:55 +00:00 · 340b2adbee
commit 340b2adbee
parent b2a56ac32a
65 changed files with 7 additions and 72 deletions
--- a/reactos/base/applications/charmap/charmap.rbuild
+++ b/reactos/base/applications/charmap/charmap.rbuild
@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes">
 	<include base="charmap">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/base/applications/control/control.rbuild
+++ b/reactos/base/applications/control/control.rbuild
@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="control" type="win32gui" baseaddress="${BASEADDRESS_CONTROL}" installbase="system32" installname="control.exe" unicode="yes">
 	<include base="control">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/base/applications/games/solitaire/solitaire.rbuild
+++ b/reactos/base/applications/games/solitaire/solitaire.rbuild
@ -7,7 +7,6 @@
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="__REACTOS__" />
 	<library>kernel32</library>
 	<library>user32</library> 
 	<library>gdi32</library> 
--- a/reactos/base/applications/msconfig/msconfig.rbuild
+++ b/reactos/base/applications/msconfig/msconfig.rbuild
@ -4,7 +4,6 @@
 	<include base="msconfig">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild
+++ b/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild
@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="devmgmt" type="win32gui" installbase="system32" installname="devmgmt.exe" unicode="yes">
 <include base="devmgmt">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/base/applications/mscutils/servman/servman.rbuild
+++ b/reactos/base/applications/mscutils/servman/servman.rbuild
@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="servman" type="win32gui" installbase="system32" installname="servman.exe" unicode="yes">
 	<include base="servman">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/base/applications/network/telnet/telnet.rbuild
+++ b/reactos/base/applications/network/telnet/telnet.rbuild
@ -3,7 +3,6 @@
 <module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe" allowwarnings ="true">
 	<include base="telnet">.</include>
 	<define name="__USE_W32API" />
-	<define name="__REACTOS__" />
 	<library>kernel32</library>
 	<library>ws2_32</library>
 	<library>user32</library>
--- a/reactos/base/applications/screensavers/cylfrac/cylfrac.rbuild
+++ b/reactos/base/applications/screensavers/cylfrac/cylfrac.rbuild
@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="cylfrac" type="win32scr" installbase="system32" installname="cylfrac.scr">
 	<define name="__USE_W32API" />
-	<define name="__REACTOS__" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />

--- a/reactos/base/applications/screensavers/logon/logon.rbuild
+++ b/reactos/base/applications/screensavers/logon/logon.rbuild
@ -3,7 +3,6 @@
 <module name="logon" type="win32scr" installbase="system32" installname="logon.scr">
 	<include base="logon">.</include>
 	<define name="__USE_W32API" />
-	<define name="__REACTOS__" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />

--- a/reactos/base/applications/screensavers/matrix/matrix.rbuild
+++ b/reactos/base/applications/screensavers/matrix/matrix.rbuild
@ -6,7 +6,6 @@
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="__REACTOS__" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />

--- a/reactos/base/applications/screensavers/scrnsave/scrnsave.rbuild
+++ b/reactos/base/applications/screensavers/scrnsave/scrnsave.rbuild
@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="scrnsave" type="win32scr" installbase="system32" installname="scrnsave.scr">
 	<define name="__USE_W32API" />
-	<define name="__REACTOS__" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />

--- a/reactos/base/applications/screensavers/starfield/starfield.rbuild
+++ b/reactos/base/applications/screensavers/starfield/starfield.rbuild
@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="starfield" type="win32scr" installbase="system32" installname="starfield.scr">
 	<define name="__USE_W32API" />
-	<define name="__REACTOS__" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />

--- a/reactos/base/services/audiosrv/audiosrv.rbuild
+++ b/reactos/base/services/audiosrv/audiosrv.rbuild
@ -3,7 +3,6 @@
 <module name="audiosrv" type="win32cui" installbase="system32" installname="audiosrv.exe" unicode="yes" allowwarnings="true">
 	<include base="audiosrv">.</include>
 	<define name="__USE_W32API" />
-	<define name="__REACTOS__" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="WINVER">0x0501</define>
 	<library>kernel32</library>
--- a/reactos/base/services/dhcp/dhcp.rbuild
+++ b/reactos/base/services/dhcp/dhcp.rbuild
@ -4,7 +4,6 @@
 	<include base="dhcp">.</include>
 	<include base="dhcp">include</include>
 	<define name="__USE_W32API" />
-	<define name="__REACTOS__" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
--- a/reactos/base/setup/usetup/usetup.rbuild
+++ b/reactos/base/setup/usetup/usetup.rbuild
@ -10,7 +10,6 @@
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_WIN32_WINNT">0x0502</define>
 	<define name="__NO_CTYPE_INLINES" />
-	<define name="__REACTOS__" />
 	<linkerflag>-lgcc</linkerflag>
 	<library>zlib</library>
 	<library>inflib</library>
--- a/reactos/base/system/msiexec/msiexec.rbuild
+++ b/reactos/base/system/msiexec/msiexec.rbuild
@ -3,7 +3,6 @@
 <module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe" allowwarnings="true">
 	<include base="msiexec">.</include>
 	<include base="ReactOS">include/wine</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x501</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/boot/freeldr/fdebug/fdebug.rbuild
+++ b/reactos/boot/freeldr/fdebug/fdebug.rbuild
@ -4,7 +4,6 @@
 	<include base="freeldr_fdebug">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/cpl/access/access.rbuild
+++ b/reactos/dll/cpl/access/access.rbuild
@ -3,7 +3,6 @@
 <module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}"  installbase="system32" installname="access.cpl" unicode="yes">
 	<importlibrary definition="access.def" />
 	<include base="access">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
--- a/reactos/dll/cpl/appwiz/appwiz.rbuild
+++ b/reactos/dll/cpl/appwiz/appwiz.rbuild
@ -3,7 +3,6 @@
 <module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}"  installbase="system32" installname="appwiz.cpl" unicode="yes">
 	<importlibrary definition="appwiz.def" />
 	<include base="appwiz">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/cpl/desk/desk.rbuild
+++ b/reactos/dll/cpl/desk/desk.rbuild
@ -3,7 +3,6 @@
 <module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes">
 	<importlibrary definition="desk.def" />
 	<include base="desk">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
+++ b/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
@ -3,7 +3,6 @@
 <module name="hdwwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32" installname="hdwwiz.cpl" unicode="yes">
 	<importlibrary definition="hdwwiz.def" />
 	<include base="hdwwiz">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/cpl/input/input.rbuild
+++ b/reactos/dll/cpl/input/input.rbuild
@ -5,7 +5,6 @@
 	<include base="input">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/cpl/intl/intl.rbuild
+++ b/reactos/dll/cpl/intl/intl.rbuild
@ -3,7 +3,6 @@
 <module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes">
 	<importlibrary definition="intl.def" />
 	<include base="intl">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x600</define>
--- a/reactos/dll/cpl/main/main.rbuild
+++ b/reactos/dll/cpl/main/main.rbuild
@ -3,7 +3,6 @@
 <module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes">
 	<importlibrary definition="main.def" />
 	<include base="main">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/cpl/mmsys/mmsys.rbuild
+++ b/reactos/dll/cpl/mmsys/mmsys.rbuild
@ -3,7 +3,6 @@
 <module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl" unicode="yes">
 	<importlibrary definition="mmsys.def" />
 	<include base="mmsys">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/cpl/ncpa/ncpa.rbuild
+++ b/reactos/dll/cpl/ncpa/ncpa.rbuild
@ -3,7 +3,6 @@
 <module name="ncpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_NCPA}" installbase="system32" installname="ncpa.cpl" unicode="yes">
 	<importlibrary definition="ncpa.def" />
 	<include base="ncpa">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/cpl/odbccp32/odbccp32.rbuild
+++ b/reactos/dll/cpl/odbccp32/odbccp32.rbuild
@ -3,7 +3,6 @@
 <module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" unicode="yes">
 	<importlibrary definition="odbccp32.def" />
 	<include base="odbccp32">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/cpl/powercfg/powercfg.rbuild
+++ b/reactos/dll/cpl/powercfg/powercfg.rbuild
@ -4,7 +4,6 @@
 	<importlibrary definition="powercfg.def" />
 	<include base="powercfg">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/cpl/sysdm/sysdm.rbuild
+++ b/reactos/dll/cpl/sysdm/sysdm.rbuild
@ -3,7 +3,6 @@
 <module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}" installbase="system32" installname="sysdm.cpl" unicode="yes">
 	<importlibrary definition="sysdm.def" />
 	<include base="sysdm">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/cpl/timedate/timedate.rbuild
+++ b/reactos/dll/cpl/timedate/timedate.rbuild
@ -3,7 +3,6 @@
 <module name="timedate" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TIMEDATE}" installbase="system32" installname="timedate.cpl" unicode="yes">
 	<importlibrary definition="timedate.def" />
 	<include base="timedate">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/cpl/usrmgr/usrmgr.rbuild
+++ b/reactos/dll/cpl/usrmgr/usrmgr.rbuild
@ -3,7 +3,6 @@
 <module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes">
 	<importlibrary definition="usrmgr.def" />
 	<include base="usrmgr">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/directx/devenum/devenum.rbuild
+++ b/reactos/dll/directx/devenum/devenum.rbuild
@ -7,7 +7,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/directx/dinput/dinput.rbuild
+++ b/reactos/dll/directx/dinput/dinput.rbuild
@ -7,7 +7,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/directx/dinput8/dinput8.rbuild
+++ b/reactos/dll/directx/dinput8/dinput8.rbuild
@ -7,7 +7,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/directx/dplay/dplay.rbuild
+++ b/reactos/dll/directx/dplay/dplay.rbuild
@ -6,7 +6,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/directx/dplayx/dplayx.rbuild
+++ b/reactos/dll/directx/dplayx/dplayx.rbuild
@ -7,7 +7,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/directx/dsound/dsound.rbuild
+++ b/reactos/dll/directx/dsound/dsound.rbuild
@ -5,7 +5,6 @@
 	<importlibrary definition="dsound.spec.def" />
 	<include base="dsound">.</include>
 	<include base="ReactOS">include/reactos/wine</include>	
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
+++ b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
@ -7,7 +7,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/directx/wine/d3d8/d3d8.rbuild
+++ b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
@ -6,7 +6,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/directx/wine/wined3d/wined3d.rbuild
+++ b/reactos/dll/directx/wine/wined3d/wined3d.rbuild
@ -4,7 +4,6 @@
 	<importlibrary definition="wined3d.def" />
 	<include base="wined3d">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/win32/acledit/acledit.rbuild
+++ b/reactos/dll/win32/acledit/acledit.rbuild
@ -3,7 +3,6 @@
 	<include base="acledit">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />

 	<metadata description = "Access Control List Editor" />
--- a/reactos/dll/win32/console/console.rbuild
+++ b/reactos/dll/win32/console/console.rbuild
@ -3,7 +3,6 @@
 	<include base="console">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/win32/crtdll/crtdll.rbuild
+++ b/reactos/dll/win32/crtdll/crtdll.rbuild
@ -8,12 +8,11 @@
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
-	<define name="__REACTOS__" />
 	<define name="USE_MSVCRT_PREFIX" />
 	<define name="_MSVCRT_LIB_" />
-    <define name="__NO_CTYPE_INLINES" />
-    <define name="_CTYPE_DISABLE_MACROS" />
-    <define name="_NO_INLINING" />
+	<define name="__NO_CTYPE_INLINES" />
+	<define name="_CTYPE_DISABLE_MACROS" />
+	<define name="_NO_INLINING" />

 	<!--	__MINGW_IMPORT needs to be defined differently because it's defined
 		as dllimport by default, which is invalid from GCC 4.1.0 on!	-->
--- a/reactos/dll/win32/cryptui/cryptui.rbuild
+++ b/reactos/dll/win32/cryptui/cryptui.rbuild
@ -1,7 +1,6 @@
 <module name="cryptui" type="win32dll" baseaddress="${BASEADDRESS_CRYPTUI}" installbase="system32" installname="cryptui.dll" allowwarnings="true">
 	<importlibrary definition="cryptui.def" />
 	<include base="cryptui">.</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/win32/dbghelp/dbghelp.rbuild
+++ b/reactos/dll/win32/dbghelp/dbghelp.rbuild
@ -2,7 +2,6 @@
 	<importlibrary definition="dbghelp.spec.def" />
 	<include base="dbghelp">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/win32/devmgr/devmgr.rbuild
+++ b/reactos/dll/win32/devmgr/devmgr.rbuild
@ -3,7 +3,6 @@
 	<importlibrary definition="devmgr.spec.def" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
+++ b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<library>wine</library>
 	<library>ntdll</library>
--- a/reactos/dll/win32/msafd/msafd.rbuild
+++ b/reactos/dll/win32/msafd/msafd.rbuild
@ -5,7 +5,6 @@
 	<include base="ReactOS">include/reactos/drivers</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<pch>msafd.h</pch>
 	<library>ntdll</library>
--- a/reactos/dll/win32/msgina/msgina.rbuild
+++ b/reactos/dll/win32/msgina/msgina.rbuild
@ -2,7 +2,6 @@
 	<importlibrary definition="msgina.def" />
 	<include base="msgina">.</include>
 	<include base="msgina">include</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<library>ntdll</library>
 	<library>wine</library>
--- a/reactos/dll/win32/msvcrt/msvcrt.rbuild
+++ b/reactos/dll/win32/msvcrt/msvcrt.rbuild
@ -10,15 +10,14 @@
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
-	<define name="__REACTOS__" />
 	<define name="USE_MSVCRT_PREFIX" />
 	<define name="_MSVCRT_LIB_" />
 	<define name="_MT" />
-    <define name="__NO_CTYPE_INLINES" />
-    <define name="_CTYPE_DISABLE_MACROS" />
-    <define name="_NO_INLINING" />
+	<define name="__NO_CTYPE_INLINES" />
+	<define name="_CTYPE_DISABLE_MACROS" />
+	<define name="_NO_INLINING" />

-    <!--	__MINGW_IMPORT needs to be defined differently because it's defined
+	<!--	__MINGW_IMPORT needs to be defined differently because it's defined
 		as dllimport by default, which is invalid from GCC 4.1.0 on!	-->
 	<define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define>

--- a/reactos/dll/win32/netcfgx/netcfgx.rbuild
+++ b/reactos/dll/win32/netcfgx/netcfgx.rbuild
@ -1,6 +1,5 @@
 <module name="netcfgx" type="win32dll" entrypoint="0" installbase="system32" installname="netcfgx.dll">
 	<importlibrary definition="netcfgx.def" />
-	<define name="__REACTOS__" />
 	<file>netcfgx.c</file>
 	<library>ntdll</library>
 	<library>rpcrt4</library>
--- a/reactos/dll/win32/setupapi/setupapi.rbuild
+++ b/reactos/dll/win32/setupapi/setupapi.rbuild
@ -7,7 +7,6 @@
 	<include base="pnp_client">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/win32/shell32/shell32.rbuild
+++ b/reactos/dll/win32/shell32/shell32.rbuild
@ -3,7 +3,6 @@
 	<importlibrary definition="shell32.spec.def" />
 	<include base="shell32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/win32/shellext/devcpux/devcpux.rbuild
+++ b/reactos/dll/win32/shellext/devcpux/devcpux.rbuild
@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/win32/user32/user32.rbuild
+++ b/reactos/dll/win32/user32/user32.rbuild
@ -5,7 +5,6 @@
 	<include base="ReactOS">include/reactos/subsys</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="WINVER">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
--- a/reactos/dll/win32/usp10/usp10.rbuild
+++ b/reactos/dll/win32/usp10/usp10.rbuild
@ -4,7 +4,6 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
--- a/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
+++ b/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
@ -3,7 +3,6 @@
 	<include base="vdmdbg">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<library>ntdll</library>
 	<library>kernel32</library>
--- a/reactos/dll/win32/ws2_32/ws2_32.rbuild
+++ b/reactos/dll/win32/ws2_32/ws2_32.rbuild
@ -6,7 +6,6 @@
 	<define name="UNICODE" />
 	<define name="LE" />
 	<define name="__USE_W32API" />
-	<define name="__REACTOS__" />
 	<define name="_WIN32_WINNT">0x0500</define>
 	<library>wine</library>
 	<library>ntdll</library>
--- a/reactos/drivers/input/i8042prt/i8042prt.rbuild
+++ b/reactos/drivers/input/i8042prt/i8042prt.rbuild
@ -4,7 +4,6 @@
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="i8042prt">.</include>
 	<define name="__USE_W32API" />
-	<define name="__REACTOS__" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>i8042prt.c</file>
--- a/reactos/lib/3rdparty/libwine/libwine.rbuild
+++ b/reactos/lib/3rdparty/libwine/libwine.rbuild
@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="wine" type="staticlibrary">
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<file>debug.c</file>
 	<file>string.c</file>
--- a/reactos/lib/drivers/oskittcp/oskittcp.rbuild
+++ b/reactos/lib/drivers/oskittcp/oskittcp.rbuild
@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="oskittcp" type="staticlibrary" allowwarnings="true">
-	<define name="__REACTOS__">1</define>
 	<define name="__NTDRIVER__"/>
 	<define name="KERNEL"/>
 	<define name="_DISABLE_TIDENTS"/>
--- a/reactos/lib/sdk/crt/crt.rbuild
+++ b/reactos/lib/sdk/crt/crt.rbuild
@ -8,7 +8,6 @@
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
-	<define name="__REACTOS__" />
 	<define name="USE_MSVCRT_PREFIX" />
 	<define name="_MSVCRT_LIB_" />
 	<define name="_MSVCRT_" />
--- a/reactos/lib/sdk/dxguid/dxguid.rbuild
+++ b/reactos/lib/sdk/dxguid/dxguid.rbuild
@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dxguid" type="staticlibrary">
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<file>dxguid-mingw.c</file>
 </module>
--- a/reactos/lib/sdk/strmiids/strmiids.rbuild
+++ b/reactos/lib/sdk/strmiids/strmiids.rbuild
@ -3,6 +3,5 @@
 <module name="strmiids" type="staticlibrary">
 	<define name="__USE_W32API" />
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__REACTOS__" />
 	<file>strmiids.c</file>
 </module>
--- a/reactos/lib/win32ksys/win32ksys.rbuild
+++ b/reactos/lib/win32ksys/win32ksys.rbuild
@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="win32ksys" type="staticlibrary">
 	<define name="_DISABLE_TIDENTS" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />

 	<directory name="." root="intermediate">