Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- Define i386 on x86 MSVC builds
- Probably fixes the infamous MSVC networking issues caused by tcpip.h assuming it was a big-endian platform and never byte-swapping anything
[TCPIP][LAN]
- Fix byteswapping on AMD64 and ARM builds too

svn path=/trunk/; revision=59704
This commit is contained in:
Cameron Gutman 2013-08-12 01:12:25 +00:00
parent 60666eecd3
commit 4ed049cc7b
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/CMakeLists.txt
View file

@ -142,7 +142,7 @@ else()
# Arch Options # Arch Options
if(ARCH STREQUAL "i386") if(ARCH STREQUAL "i386")
add_definitions(-D_M_IX86 -D_X86_ -D__i386__) add_definitions(-D_M_IX86 -D_X86_ -D__i386__ -Di386)
elseif(ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "amd64")
add_definitions(-D_M_AMD64 -D_AMD64_ -D__x86_64__ -D_WIN64) add_definitions(-D_M_AMD64 -D_AMD64_ -D__x86_64__ -D_WIN64)
elseif(ARCH STREQUAL "arm") elseif(ARCH STREQUAL "arm")

6
reactos/drivers/network/lan/include/net_wh.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#ifdef i386 #if defined(i386) || defined(_AMD64_) || defined(_ARM_)
/* DWORD network to host byte order conversion for i386 */ /* DWORD network to host byte order conversion for i386 */
#define DN2H(dw) \ #define DN2H(dw) \
@ -26,7 +26,7 @@
((((w) & 0xFF00) >> 8) | \ ((((w) & 0xFF00) >> 8) | \
(((w) & 0x00FF) << 8)) (((w) & 0x00FF) << 8))
#else /* i386 */ #else /* defined(i386) || defined(_AMD64_) || defined(_ARM_) */
/* DWORD network to host byte order conversion for other architectures */ /* DWORD network to host byte order conversion for other architectures */
#define DN2H(dw) \ #define DN2H(dw) \
@ -44,4 +44,4 @@
#define WH2N(w) \ #define WH2N(w) \
(w) (w)
#endif /* i386 */ #endif /* defined(i386) || defined(_AMD64_) || defined(_ARM_) */

6
reactos/drivers/network/tcpip/include/tcpip.h
View file

@ -65,7 +65,7 @@
#define NDIS_BUFFER_TAG FOURCC('n','b','u','f') #define NDIS_BUFFER_TAG FOURCC('n','b','u','f')
#define NDIS_PACKET_TAG FOURCC('n','p','k','t') #define NDIS_PACKET_TAG FOURCC('n','p','k','t')
#ifdef i386 #if defined(i386) || defined(_AMD64_) || defined(_ARM_)
/* DWORD network to host byte order conversion for i386 */ /* DWORD network to host byte order conversion for i386 */
#define DN2H(dw) \ #define DN2H(dw) \
@ -91,7 +91,7 @@
((((w) & 0xFF00) >> 8) | \ ((((w) & 0xFF00) >> 8) | \
(((w) & 0x00FF) << 8)) (((w) & 0x00FF) << 8))
#else /* i386 */ #else /* defined(i386) || defined(_AMD64_) || defined(_ARM_) */
#error Unsupported architecture #error Unsupported architecture
@ -111,7 +111,7 @@
#define WH2N(w) \ #define WH2N(w) \
(w) (w)
#endif /* i386 */ #endif /* defined(i386) || defined(_AMD64_) || defined(_ARM_) */
/* AF_INET and other things Arty likes to use ;) */ /* AF_INET and other things Arty likes to use ;) */
#define AF_INET 2 #define AF_INET 2