ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename _REACTOS_ to __REACTOS__

Browse Source 
svn path=/trunk/; revision=29420
This commit is contained in:
Hervé Poussineau
2007-10-06 18:04:03 +00:00
parent 1beed38801
commit 388fa4820c
6 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/ReactOS-generic.rbuild
+1 -1
View File
@@ -3,7 +3,7 @@
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="baseaddress.rbuild" />
<define name="_REACTOS_" />
<define name="__REACTOS__" />
<if property="MP" value="1">
<define name="CONFIG_SMP" value="1" />
</if>
reactos/ReactOS-ppc.rbuild
+23 -24
View File
@@ -10,30 +10,29 @@
<xi:include href="ReactOS-generic.rbuild" />
<property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -nostdlib -nostartfiles -lgcc -Wl,-e,__start -Wl,-Ttext,0xe00000 -N"/>
<property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles"/>
<property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles"/>
<define name="_M_PPC" />
<define name="_PPC_" />
<define name="__PowerPC__" />
<define name="_REACTOS_" />
<define name="stdcall" empty="true" />
<define name="__stdcall__" empty="true" />
<define name="fastcall" empty="true" />
<define name="cdecl" empty="true" />
<define name="__cdecl__" empty="true" />
<define name="dllimport" empty="true" />
<define name="WORDS_BIGENDIAN" empty="true" />
<define name="__MSVCRT__" empty="true" />
<define name="__NO_CTYPE_INLINES" />
<define name="__DECLSPEC_SUPPORTED" />
<define name="__MINGW_IMPORT">extern</define>
<define name="_CRTIMP" empty="true" />
<define name="'__declspec(x)'" empty="true" />
<compilerflag>-fshort-wchar</compilerflag>
<compilerflag>-fsigned-char</compilerflag>
<compilerflag>-mfull-toc</compilerflag>
<compilerflag>-meabi</compilerflag>
<compilerflag>-O2</compilerflag>
<compilerflag>-Wno-strict-aliasing</compilerflag>
<define name="_M_PPC" />
<define name="_PPC_" />
<define name="__PowerPC__" />
<define name="stdcall" empty="true" />
<define name="__stdcall__" empty="true" />
<define name="fastcall" empty="true" />
<define name="cdecl" empty="true" />
<define name="__cdecl__" empty="true" />
<define name="dllimport" empty="true" />
<define name="WORDS_BIGENDIAN" empty="true" />
<define name="__MSVCRT__" empty="true" />
<define name="__NO_CTYPE_INLINES" />
<define name="__DECLSPEC_SUPPORTED" />
<define name="__MINGW_IMPORT">extern</define>
<define name="_CRTIMP" empty="true" />
<define name="'__declspec(x)'" empty="true" />
<compilerflag>-fshort-wchar</compilerflag>
<compilerflag>-fsigned-char</compilerflag>
<compilerflag>-mfull-toc</compilerflag>
<compilerflag>-meabi</compilerflag>
<compilerflag>-O2</compilerflag>
<compilerflag>-Wno-strict-aliasing</compilerflag>
</project>
reactos/base/services/dhcp/dhclient.c
+2 -2
View File
@@ -433,7 +433,7 @@ dhcpack(struct packet *packet)
ip->client->new->rebind = ip->client->new->renewal +
ip->client->new->renewal / 2 + ip->client->new->renewal / 4;
#ifdef _REACTOS_
#ifdef __REACTOS__
ip->client->new->obtained = cur_time;
#endif
ip->client->new->expiry += cur_time;
@@ -825,7 +825,7 @@ packet_to_lease(struct packet *packet)
lease->address.len = sizeof(packet->raw->yiaddr);
memcpy(lease->address.iabuf, &packet->raw->yiaddr, lease->address.len);
#ifdef _REACTOS_
#ifdef __REACTOS__
lease->serveraddress.len = sizeof(packet->raw->siaddr);
memcpy(lease->serveraddress.iabuf, &packet->raw->siaddr, lease->address.len);
#endif
reactos/base/services/dhcp/include/dhcpd.h
+2 -2
View File
@@ -158,7 +158,7 @@ struct client_lease {
time_t expiry, renewal, rebind;
struct iaddr address;
char *server_name;
#ifdef _REACTOS_
#ifdef __REACTOS__
time_t obtained;
struct iaddr serveraddress;
#endif
@@ -178,7 +178,7 @@ enum dhcp_state {
S_BOUND,
S_RENEWING,
S_REBINDING,
S_STATIC
S_STATIC
};
struct client_config {
reactos/include/ndk/i386/ketypes.h
+1 -1
View File
@@ -628,7 +628,7 @@ typedef struct _KIPCR
ULONG IDR;
PVOID KdVersionBlock;
PKIDTENTRY IDT;
#ifdef _REACTOS_
#ifdef __REACTOS__
PUSHORT GDT;
#else
PKGDTENTRY GDT;
reactos/include/psdk/rpc.h
+1 -1
View File
@@ -22,7 +22,7 @@
extern "C" {
#endif
#if defined( MAC ) || defined( _MAC ) || defined(__powerpc__) && !defined(_REACTOS_)
#if defined( MAC ) || defined( _MAC ) || defined(__powerpc__) && !defined(__REACTOS__)
#define __RPC_MAC__
#define __RPC_WIN32__
#include <pshpack2.h>